Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
compendium-v2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
geant-swd
compendium-v2
Commits
7a38e9fd
Commit
7a38e9fd
authored
6 months ago
by
Bjarke Madsen
Browse files
Options
Downloads
Patches
Plain Diff
Add Let's Encrypt to mapping for certificates question
Remove unnecessary logging
parent
790c7bc0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
compendium_v2/conversion/mapping.py
+1
-0
1 addition, 0 deletions
compendium_v2/conversion/mapping.py
compendium_v2/publishers/excel_parser.py
+0
-11
0 additions, 11 deletions
compendium_v2/publishers/excel_parser.py
with
1 addition
and
11 deletions
compendium_v2/conversion/mapping.py
+
1
−
0
View file @
7a38e9fd
...
...
@@ -577,6 +577,7 @@ VALUE_TO_CODE_MAPPING = {
"
GeoDaddy
"
:
"
GeoDaddy
"
,
"
GeoTrust
"
:
"
GeoTrust
"
,
"
Digicert
"
:
"
Digicert
"
,
"
Let
'
s Encrypt
"
:
"
Let
'
s Encrypt
"
,
"
Other
"
:
"
other
"
},
16724
:
INTERCONNECTION
,
...
...
This diff is collapsed.
Click to expand it.
compendium_v2/publishers/excel_parser.py
+
0
−
11
View file @
7a38e9fd
...
...
@@ -40,12 +40,10 @@ def fetch_funding_excel_data():
def
hard_number_convert
(
s
,
source_name
,
nren
,
year
):
if
s
is
None
:
# logger.info(f'Invalid Value :{nren} has empty value for {source_name} for year ({year})')
return
float
(
0
)
try
:
return
float
(
s
)
except
ValueError
:
logger
.
info
(
f
'
Invalid Value :
{
nren
}
has empty value for
{
source_name
}
for year (
{
year
}
) with value (
{
s
}
)
'
)
return
float
(
0
)
# iterate over the rows in the worksheet
...
...
@@ -151,7 +149,6 @@ def fetch_charging_structure_excel_data():
nren
=
ws
.
cell
(
row
=
row
,
column
=
col_start
).
value
charging_structure
=
ws
.
cell
(
row
=
row
,
column
=
col_start
+
1
).
value
structure_2
=
ws
.
cell
(
row
=
row
,
column
=
col_start
+
2
).
value
logger
.
info
(
f
'
NREN:
{
nren
}
, Charging Structure:
{
charging_structure
}
,
{
structure_2
}
, Year:
{
year
}
'
)
if
charging_structure
is
not
None
:
if
structure_2
not
in
[
None
,
''
]:
charging_structure
=
FeeType
.
other
...
...
@@ -187,7 +184,6 @@ def fetch_staffing_excel_data():
try
:
return
float
(
value
)
except
(
TypeError
,
ValueError
):
logger
.
info
(
f
'
NREN:
{
nren
}
year:
{
year
}
has
{
value
}
for
{
description
}
; set to 0.
'
)
return
0
def
create_points_for_year
(
year
,
nren_column
,
start_column
):
...
...
@@ -223,8 +219,6 @@ def fetch_staff_function_excel_data():
try
:
return
float
(
value
)
except
(
TypeError
,
ValueError
):
logger
.
info
(
f
'
NREN:
{
nren
}
year:
{
year
}
has
{
"
NO DATA
"
if
value
==
""
else
value
}
for
{
description
}
; set to 0.
'
)
return
0
def
create_points_for_year_until_2019
(
year
,
nren_column
,
start_column
):
...
...
@@ -324,7 +318,6 @@ def fetch_traffic_excel_data():
try
:
return
float
(
value
)
except
(
TypeError
,
ValueError
):
logger
.
info
(
f
'
NREN:
{
nren
}
year:
{
year
}
has
{
value
}
for
{
description
}
; set to 0.
'
)
return
0
def
create_points_for_year
(
year
,
start_column
):
...
...
@@ -421,7 +414,6 @@ def get_category(excel_cat):
return
UserCategory
.
government
if
"
profit
"
in
excel_cat
.
lower
():
return
UserCategory
.
for_profit_orgs
logger
.
warning
(
f
'
unknown user category:
{
excel_cat
}
'
)
def
fetch_remit_excel_data
():
...
...
@@ -444,7 +436,6 @@ def fetch_remit_excel_data():
return
ConnectivityCoverage
.
no_other
if
"
unsure
"
in
excel_remit
.
lower
():
return
ConnectivityCoverage
.
unsure
logger
.
warning
(
f
'
unknown remit:
{
excel_remit
}
'
)
result
=
{}
...
...
@@ -651,7 +642,6 @@ def fetch_carriers_excel_data():
return
CarryMechanism
.
other
if
"
regional
"
in
excel_carrier
.
lower
():
return
CarryMechanism
.
regional_nren_backbone
logger
.
warning
(
f
'
unknown carrier:
{
excel_carrier
}
'
)
result
=
{}
...
...
@@ -864,7 +854,6 @@ def fetch_iru_duration_excel_data():
try
:
years
=
int
(
years
)
except
ValueError
:
logger
.
warning
(
f
'
Invalid iru duration Value :
{
nren_name
}
(
{
year
}
) with value (
{
years
}
)
'
)
continue
result
[(
nren_name
,
year
)]
=
years
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment