Skip to content

Commit

Permalink
Fix nokia dag task
Browse files Browse the repository at this point in the history
  • Loading branch information
erssebaggala authored Mar 28, 2019
1 parent 1e7db68 commit 63be1a8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
.idea/
*.xlsm
*.xls
*.xlsx
*.xlsx
mediation/data
2 changes: 1 addition & 1 deletion mediation/packages/bts/huawei_cm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ def extract_live_network_3g_cells(self):

session.close()

def extract_live_network_3g_cells_params(self):
def extract_live_network_3g_cell_params(self):
Session = sessionmaker(bind=self.db_engine)
session = Session()

Expand Down
8 changes: 4 additions & 4 deletions mediation/packages/bts/nokia_cm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ def extract_live_network_2g2g_nbrs(self):
INNER JOIN live_network.sites t7 ON t7.pk = t6.site_pk AND t7.tech_pk = 2
WHERE
t3.site_pk = '{0}'
AND t8.is_current_load = true
AND t9.is_current_load = true
""".format(site_pk)

self.db_engine.execute(text(sql).execution_options(autocommit=True))
Expand Down Expand Up @@ -1126,7 +1126,7 @@ def extract_live_network_3g2g_nbrs(self):
INNER JOIN live_network.sites t7 ON t7.pk = t6.site_pk
WHERE
t3.site_pk = '{0}'
AND t8.is_current_load = true
AND t9.is_current_load = true
AND t1."DISTNAME" ~ '.*WCEL-.*'
""".format(site_pk)
Expand Down Expand Up @@ -1257,7 +1257,7 @@ def extract_live_network_4g3g_nbrs(self):
t1."DATETIME" AS date_modified,
0 as added_by,
0 AS modified_by
FROM nokia_cm."ADJG" t1
FROM nokia_cm."LNADJW" t1
INNER JOIN cm_loads t9 on t9.pk = t1."LOADID"
INNER JOIN nokia_cm."WCEL" t2 ON t2."FILENAME" = t1."FILENAME" AND t2."DISTNAME" = SUBSTRING(t1."DISTNAME", '.*WCEL-\d+') AND t2."LOADID" = t1."LOADID"
INNER JOIN live_network.cells t3 ON t3.name = CONCAT(TRIM(t2."name"),'(',TRIM(t2."CId"),')') AND t3.vendor_pk = 4 AND t3.tech_pk = 3
Expand All @@ -1267,7 +1267,7 @@ def extract_live_network_4g3g_nbrs(self):
INNER JOIN live_network.sites t7 ON t7.pk = t6.site_pk
WHERE
t3.site_pk = '{0}'
AND t8.is_current_load = true
AND t9.is_current_load = true
AND t1."DISTNAME" ~ '.*WCEL-.*'
""".format(site_pk)
Expand Down

0 comments on commit 63be1a8

Please sign in to comment.