X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fsdncontroller.py;h=4f3ced44f27800520e85ea209c337583c411bd04;hb=c94275062d1faf60c9b6ac360506bbd1a715c0ab;hp=61299612c11d277971b7bef4be6bf4b6da9f2418;hpb=be96096ebd71c8d36c8375387f8e671f12eedfb0;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/sdncontroller.py b/osmclient/sol005/sdncontroller.py
index 6129961..4f3ced4 100644
--- a/osmclient/sol005/sdncontroller.py
+++ b/osmclient/sol005/sdncontroller.py
@@ -19,6 +19,7 @@ OSM SDN controller API handling
 """
 
 from osmclient.common import utils
+from osmclient.common import wait as WaitForStatus
 from osmclient.common.exceptions import ClientException
 from osmclient.common.exceptions import NotFound
 import json
@@ -33,17 +34,46 @@ class SdnController(object):
         self._apiResource = '/sdns'
         self._apiBase = '{}{}{}'.format(self._apiName,
                                         self._apiVersion, self._apiResource)
-    def create(self, name, sdn_controller):
+
+    # SDNC '--wait' option
+    def _wait(self, id, deleteFlag=False):
+        self._client.get_token()
+        # Endpoint to get operation status
+        apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/sdns')
+        # Wait for status for SDN instance creation/update/deletion
+        WaitForStatus.wait_for_status(
+            'SDNC',
+            str(id),
+            WaitForStatus.TIMEOUT_SDNC_OPERATION,
+            apiUrlStatus,
+            self._http.get2_cmd,
+            deleteFlag=deleteFlag)
+
+    def _get_id_for_wait(self, name):
+        # Returns id of name, or the id itself if given as argument
+        for sdnc in self.list():
+            if name == sdnc['_id']:
+                return sdnc['_id']
+        for sdnc in self.list():
+            if name == sdnc['name']:
+                return sdnc['_id']
+        return ''
+
+    def create(self, name, sdn_controller, wait=False):
+        self._client.get_token()
         http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
                                        postfields_dict=sdn_controller)
-        #print 'HTTP CODE: {}'.format(http_code)
-        #print 'RESP: {}'.format(resp)
+        #print('HTTP CODE: {}'.format(http_code))
+        #print('RESP: {}'.format(resp))
         if http_code in (200, 201, 202, 204):
             if resp:
                 resp = json.loads(resp)
             if not resp or 'id' not in resp:
                 raise ClientException('unexpected response from server - {}'.format(
                                       resp))
+            if wait:
+                # Wait for status for SDNC instance creation
+                self._wait(resp.get('id'))
             print(resp['id'])
         else:
             msg = ""
@@ -54,19 +84,23 @@ class SdnController(object):
                     msg = resp
             raise ClientException("failed to create SDN controller {} - {}".format(name, msg))
 
-    def update(self, name, sdn_controller):
+    def update(self, name, sdn_controller, wait=False):
+        self._client.get_token()
         sdnc = self.get(name)
-        http_code, resp = self._http.put_cmd(endpoint='{}/{}'.format(self._apiBase,sdnc['_id']),
+        sdnc_id_for_wait = self._get_id_for_wait(name)
+        http_code, resp = self._http.patch_cmd(endpoint='{}/{}'.format(self._apiBase,sdnc['_id']),
                                        postfields_dict=sdn_controller)
-        #print 'HTTP CODE: {}'.format(http_code)
-        #print 'RESP: {}'.format(resp)
+        # print('HTTP CODE: {}'.format(http_code))
+        # print('RESP: {}'.format(resp))
         if http_code in (200, 201, 202, 204):
-            if resp:
-                resp = json.loads(resp)
-            if not resp or 'id' not in resp:
-                raise ClientException('unexpected response from server - {}'.format(
-                                      resp))
-            print(resp['id'])
+            if wait:
+                # In this case, 'resp' always returns None, so 'resp['id']' cannot be used.
+                # Use the previously obtained id instead.
+                wait_id = sdnc_id_for_wait
+                # Wait for status for VI instance update
+                self._wait(wait_id)
+            else:
+                pass
         else:
             msg = ""
             if resp:
@@ -76,17 +110,23 @@ class SdnController(object):
                     msg = resp
             raise ClientException("failed to update SDN controller {} - {}".format(name, msg))
 
-    def delete(self, name, force=False):
+    def delete(self, name, force=False, wait=False):
+        self._client.get_token()
         sdn_controller = self.get(name)
+        sdnc_id_for_wait = self._get_id_for_wait(name)
         querystring = ''
         if force:
             querystring = '?FORCE=True'
         http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
                                          sdn_controller['_id'], querystring))
-        #print 'HTTP CODE: {}'.format(http_code)
-        #print 'RESP: {}'.format(resp)
+        #print('HTTP CODE: {}'.format(http_code))
+        #print('RESP: {}'.format(resp))
         if http_code == 202:
-            print('Deletion in progress')
+            if wait:
+                # Wait for status for SDNC instance deletion
+                self._wait(sdnc_id_for_wait, deleteFlag=True)
+            else:
+                print('Deletion in progress')
         elif http_code == 204:
             print('Deleted')
         elif resp and 'result' in resp:
@@ -103,11 +143,12 @@ class SdnController(object):
     def list(self, filter=None):
         """Returns a list of SDN controllers
         """
+        self._client.get_token()
         filter_string = ''
         if filter:
             filter_string = '?{}'.format(filter)
         resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string))
-        #print 'RESP: {}'.format(resp)
+        #print('RESP: {}'.format(resp))
         if resp:
             return resp
         return list()
@@ -115,6 +156,7 @@ class SdnController(object):
     def get(self, name):
         """Returns an SDN controller based on name or id
         """
+        self._client.get_token()
         if utils.validate_uuid4(name):
             for sdnc in self.list():
                 if name == sdnc['_id']: