X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=34cb68378a7672847d8b605b205528b172dfe13c;hb=9cc31e122dc2119a94c767e72f24e6ab27d31f73;hp=b271e039c4e29d8444da92b69d8f7290b74e764e;hpb=ab51ef7a920bfb6d036d18ae5f3063a0d780cab2;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index b271e03..34cb683 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -96,7 +96,7 @@ class Ns(object):
                     msg = resp
             raise ClientException("failed to delete ns {} - {}".format(name, msg))
 
-    def create(self, nsd_name, nsr_name, account, wim_account=None, config=None,
+    def create(self, nsd_name, nsr_name, account, config=None,
                ssh_keys=None, description='default description',
                admin_status='ENABLED'):
 
@@ -132,8 +132,6 @@ class Ns(object):
         ns['nsName'] = nsr_name
         ns['nsDescription'] = description
         ns['vimAccountId'] = get_vim_account_id(account)
-        if wim_account:   # at this point is a string or None
-            ns['wimAccountId'] = get_wim_account_id(yaml.load(wim_account))
         #ns['userdata'] = {}
         #ns['userdata']['key1']='value1'
         #ns['userdata']['key2']='value2'
@@ -181,6 +179,10 @@ class Ns(object):
                     if not additional_param_vnf.get("additionalParams"):
                         raise ValueError("Error at --config 'additionalParamsForVnf' items must contain "
                                          "'additionalParams'")
+            if "wim_account" in ns_config:
+                wim_account = ns_config.pop("wim_account")
+                if wim_account is not None:
+                    ns['wimAccountId'] = get_wim_account_id(wim_account)
 
         # print yaml.safe_dump(ns)
         try: