MME FIX
Change-Id: Id0e418d9146910bc96613c703aa7349b6c2ece32
diff --git a/xos/synchronizer/steps/sync_imsi.py b/xos/synchronizer/steps/sync_imsi.py
index 94fdb6f..12918f1 100644
--- a/xos/synchronizer/steps/sync_imsi.py
+++ b/xos/synchronizer/steps/sync_imsi.py
@@ -57,8 +57,7 @@
def delete_record(self, o):
log.info("deleting imsi", object=str(o), **o.tologdict())
- onos = ProgranHelpers.get_progran_onos_info(o)
+ onos = ProgranHelpers.get_progran_onos_info()
profile_url = "http://%s:%s/onos/progran/imsi/%s" % (onos['url'], onos['port'], o.imsi_number)
r = requests.delete(profile_url, auth=HTTPBasicAuth(onos['username'], onos['password']))
- o.active_enodeb_id = 0 # removing the value because it has been deleted
log.info("IMSI synchronized", response=r.json())
\ No newline at end of file
diff --git a/xos/synchronizer/steps/sync_progranserviceinstance.py b/xos/synchronizer/steps/sync_progranserviceinstance.py
index 656cae1..84f60c5 100644
--- a/xos/synchronizer/steps/sync_progranserviceinstance.py
+++ b/xos/synchronizer/steps/sync_progranserviceinstance.py
@@ -83,6 +83,7 @@
log.info("EnodeB synchronized", response=r.json())
o.previously_sync = True
+ o.save()
def get_handover_for_profile(self, o):
return {
@@ -111,8 +112,10 @@
"Name": o.name,
"UlAllocRBRate": o.UlAllocRBRate,
"Handover": self.get_handover_for_profile(o),
- 'mmeip': o.mmeip,
- 'mmeport': o.mmeport,
+ "MMECfg": {
+ "Port": o.mmeport,
+ "IPAddr": o.mmeip,
+ },
'DlWifiRate': o.DlWifiRate,
'DlUeAllocRbRate': o.DlUeAllocRbRate,
}
diff --git a/xos/synchronizer/steps/sync_progranserviceinstance_back.py b/xos/synchronizer/steps/sync_progranserviceinstance_back.py
index 87b758c..5b8552b 100644
--- a/xos/synchronizer/steps/sync_progranserviceinstance_back.py
+++ b/xos/synchronizer/steps/sync_progranserviceinstance_back.py
@@ -162,6 +162,10 @@
si.no_sync = True
si.previously_sync = True
+ if p["MMECfg"]:
+ si.mmeip = str(p["MMECfg"]["IPAddr"])
+ si.mmeport = str(p["MMECfg"]["Port"])
+
si.enacted = time.mktime(datetime.datetime.now().timetuple())
si.save()
@@ -172,11 +176,11 @@
deleted_profiles = ProgranHelpers.list_diff(existing_profiles, updated_profiles)
if len(deleted_profiles) > 0:
- log.debug("Profiles %s have been removed in progran, removing them from XOS" % str(deleted_profiles))
for p in deleted_profiles:
si = ProgranServiceInstance.objects.get(name=p)
if si.created_by == 'XOS' and si.previously_sync == False:
# don't delete if the profile has been created by XOS and it hasn't been sync'ed yet
continue
# TODO delete also the associated Handover
+ log.debug("Profiles %s have been removed in progran, removing it from XOS" % str(p.name))
si.delete()