[CORD-2673] Polling IMSI
Change-Id: Id523d72283ca4ce5230176acdca96f4e264c3d88
diff --git a/xos/synchronizer/steps/sync_imsi.py b/xos/synchronizer/steps/sync_imsi.py
index 93af41f..1cc6338 100644
--- a/xos/synchronizer/steps/sync_imsi.py
+++ b/xos/synchronizer/steps/sync_imsi.py
@@ -79,9 +79,9 @@
# fetch the IMSI we just created
# NOTE we won't need this method once we'll have polling in place
- imsi_url = "http://%s:%s/onos/progran/imsi/%s" % (base_fields['onos_url'], base_fields['onos_port'], o.imsi_number)
- r = requests.get(imsi_url)
- o.ue_status = r.json()['ImsiArray'][0]['UeStatus']
+ # imsi_url = "http://%s:%s/onos/progran/imsi/%s" % (base_fields['onos_url'], base_fields['onos_port'], o.imsi_number)
+ # r = requests.get(imsi_url)
+ # o.ue_status = r.json()['ImsiArray'][0]['UeStatus']
o.save()
diff --git a/xos/synchronizer/steps/sync_imsi_back.py b/xos/synchronizer/steps/sync_imsi_back.py
new file mode 100644
index 0000000..9398c76
--- /dev/null
+++ b/xos/synchronizer/steps/sync_imsi_back.py
@@ -0,0 +1,99 @@
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import os
+import sys
+
+import datetime
+import time
+
+from synchronizers.new_base.SyncInstanceUsingAnsible import SyncStep
+from synchronizers.new_base.modelaccessor import MCordSubscriberInstance
+
+from xosconfig import Config
+from multistructlog import create_logger
+import json
+import requests
+from requests.auth import HTTPBasicAuth
+
+
+
+log = create_logger(Config().get('logging'))
+
+parentdir = os.path.join(os.path.dirname(__file__), "..")
+sys.path.insert(0, parentdir)
+sys.path.insert(0, os.path.dirname(__file__))
+from helpers import ProgranHelpers
+
+class SyncImsiBack(SyncStep):
+ provides = [MCordSubscriberInstance]
+
+ observes = MCordSubscriberInstance
+
+
+ def call(self, failed=[], deletion=False):
+ """
+ Read profile from progran and save them in xos
+ """
+
+ if deletion == False:
+ # NOTE we won't it to run only after the delete has completed
+ return
+
+ log.info("Reading IMSI from progran")
+ onos = ProgranHelpers.get_progran_onos_info()
+ imsi_url = "http://%s:%s/onos/progran/imsi/" % (onos['url'], onos['port'])
+ r = requests.get(imsi_url, auth=HTTPBasicAuth(onos['username'], onos['password']))
+ res = r.json()['ImsiArray']
+
+ print res
+
+
+ field_mapping = {
+ 'IMSI': 'imsi_number',
+ 'UeStatus': 'ue_status'
+ }
+
+ updated_imsi = []
+
+ for i in res:
+ # imsi for profiles
+ try:
+ si = MCordSubscriberInstance.objects.get(imsi_number=i['IMSI'])
+ log.info("IMSI %s already exists, updating it" % i['IMSI'])
+ except IndexError:
+ si = MCordSubscriberInstance()
+
+ si.no_sync = True
+ si.backend_code = 1
+ si.backend_status = "OK"
+
+ log.info("IMSI %s is new, creating it" % i['IMSI'])
+
+ si = ProgranHelpers.update_fields(si, i, field_mapping,)
+
+ si.save()
+
+ updated_imsi.append(si.imsi_number)
+
+ existing_imsi = [p.imsi_number for p in MCordSubscriberInstance.objects.all() if not p.is_new]
+ deleted_imsi = ProgranHelpers.list_diff(existing_imsi, updated_imsi)
+
+ if len(deleted_imsi) > 0:
+ log.info("Profiles %s have been removed in progran, removing them from XOS" % str(deleted_imsi))
+ for p in deleted_imsi:
+ si = MCordSubscriberInstance.objects.get(imsi_number=p)
+ si.delete()
diff --git a/xos/synchronizer/steps/sync_progranserviceinstance_back.py b/xos/synchronizer/steps/sync_progranserviceinstance_back.py
index ae97c95..a7c2b73 100644
--- a/xos/synchronizer/steps/sync_progranserviceinstance_back.py
+++ b/xos/synchronizer/steps/sync_progranserviceinstance_back.py
@@ -103,7 +103,6 @@
log.info("Profile %s already exists, updating it" % p['Name'])
except IndexError:
si = ProgranServiceInstance()
- si.name = p['Name']
si.no_sync = True