X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fsol005%2Fnsi.py;h=33c0b92d61c01f60c937d5a4e7f68168c50b6072;hb=7b716df9faa2fbe223b7525118842988d97fbd5e;hp=f6009ddbcdb81a845a0997ad9ddfd36cac353226;hpb=3f592284d97ed71e8d7bab435586f12623691e47;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/nsi.py b/osmclient/sol005/nsi.py
index f6009dd..33c0b92 100644
--- a/osmclient/sol005/nsi.py
+++ b/osmclient/sol005/nsi.py
@@ -19,6 +19,7 @@ OSM NSI (Network Slice Instance) 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 yaml
@@ -36,6 +37,19 @@ class Nsi(object):
         self._apiBase = '{}{}{}'.format(self._apiName,
                                         self._apiVersion, self._apiResource)
 
+    # NSI '--wait' option
+    def _wait(self, id, deleteFlag=False):
+        # Endpoint to get operation status
+        apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/nsi_lcm_op_occs')
+        # Wait for status for NSI instance creation/update/deletion
+        WaitForStatus.wait_for_status(
+            'NSI',
+            str(id),
+            WaitForStatus.TIMEOUT_NSI_OPERATION,
+            apiUrlStatus,
+            self._http.get2_cmd,
+            deleteFlag=deleteFlag)
+
     def list(self, filter=None):
         """Returns a list of NSI
         """
@@ -74,17 +88,23 @@ class Nsi(object):
             return resp
         raise NotFound("nsi {} not found".format(name))
 
-    def delete(self, name, force=False):
+    def delete(self, name, force=False, wait=False):
         nsi = self.get(name)
         querystring = ''
         if force:
             querystring = '?FORCE=True'
         http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
                                          nsi['_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 and resp:
+                resp = json.loads(resp)
+                # Wait for status for NSI instance deletion
+                # For the 'delete' operation, '_id' is used
+                self._wait(resp.get('_id'), deleteFlag=True)
+            else:
+                print('Deletion in progress')
         elif http_code == 204:
             print('Deleted')
         else:
@@ -98,7 +118,7 @@ class Nsi(object):
 
     def create(self, nst_name, nsi_name, account, config=None,
                ssh_keys=None, description='default description',
-               admin_status='ENABLED'):
+               admin_status='ENABLED', wait=False):
 
         nst = self._client.nst.get(nst_name)
 
@@ -161,7 +181,25 @@ class Nsi(object):
                                 vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account"))
                 nsi["netslice-subnet"] = nsi_config["netslice-subnet"]
 
-        #print yaml.safe_dump(nsi)
+            if "additionalParamsForNsi" in nsi_config:
+                nsi["additionalParamsForNsi"] = nsi_config.pop("additionalParamsForNsi")
+                if not isinstance(nsi["additionalParamsForNsi"], dict):
+                    raise ValueError("Error at --config 'additionalParamsForNsi' must be a dictionary")
+            if "additionalParamsForSubnet" in nsi_config:
+                nsi["additionalParamsForSubnet"] = nsi_config.pop("additionalParamsForSubnet")
+                if not isinstance(nsi["additionalParamsForSubnet"], list):
+                    raise ValueError("Error at --config 'additionalParamsForSubnet' must be a list")
+                for additional_param_subnet in nsi["additionalParamsForSubnet"]:
+                    if not isinstance(additional_param_subnet, dict):
+                        raise ValueError("Error at --config 'additionalParamsForSubnet' items must be dictionaries")
+                    if not additional_param_subnet.get("id"):
+                        raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain subnet 'id'")
+                    if not additional_param_subnet.get("additionalParamsForNs") and\
+                            not additional_param_subnet.get("additionalParamsForVnf"):
+                        raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain "
+                                         "'additionalParamsForNs' and/or 'additionalParamsForVnf'")
+
+        # print yaml.safe_dump(nsi)
         try:
             self._apiResource = '/netslice_instances_content'
             self._apiBase = '{}{}{}'.format(self._apiName,
@@ -181,6 +219,9 @@ class Nsi(object):
                 if not resp or 'id' not in resp:
                     raise ClientException('unexpected response from server - {} '.format(
                                       resp))
+                if wait:
+                    # Wait for status for NSI instance creation
+                    self._wait(resp.get('nsilcmop_id'))
                 print(resp['id'])
             else:
                 msg = ""
@@ -208,7 +249,7 @@ class Nsi(object):
             filter_string = ''
             if filter:
                 filter_string = '&{}'.format(filter)
-            http_code, resp = self._http.get2_cmd('{}?nsiInstanceId={}'.format(
+            http_code, resp = self._http.get2_cmd('{}?netsliceInstanceId={}'.format(
                                                        self._apiBase, nsi['_id'],
                                                        filter_string) )
             #print 'HTTP CODE: {}'.format(http_code)