Support of WIM accounts in osmclient

[osm/osmclient.git] / osmclient / sol005 / ns.py

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index c640d00..9d1fe95 100644 (file)
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -124,16 +124,10 @@ class Ns(object):
         #ns['userdata']['key2']='value2'
 
         if ssh_keys is not None:
-            # ssh_keys is comma separate list
-            # ssh_keys_format = []
-            # for key in ssh_keys.split(','):
-            #     ssh_keys_format.append({'key-pair-ref': key})
-            #
-            # ns['ssh-authorized-key'] = ssh_keys_format
-            ns['ssh-authorized-key'] = []
+            ns['ssh_keys'] = []
             for pubkeyfile in ssh_keys.split(','):
                 with open(pubkeyfile, 'r') as f:
-                    ns['ssh-authorized-key'].append(f.read())
+                    ns['ssh_keys'].append(f.read())
         if config:
             ns_config = yaml.load(config)
             if "vim-network-name" in ns_config:
@@ -151,7 +145,6 @@ class Ns(object):
                 for vnf in ns_config["vnf"]:
                     if vnf.get("vim_account"):
                         vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account"))
-
                 ns["vnf"] = ns_config["vnf"]
 
         #print yaml.safe_dump(ns)
@@ -293,6 +286,27 @@ class Ns(object):
                     exc.message)
             raise ClientException(message)
 
+    def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out):
+        """Scales a VNF by adding/removing VDUs
+        """
+        try:
+            op_data={}
+            op_data["scaleType"] = "SCALE_VNF"
+            op_data["scaleVnfData"] = {}
+            if scale_in:
+                op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_IN"
+            else:
+                op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_OUT"
+            op_data["scaleVnfData"]["scaleByStepData"] = {
+                "member-vnf-index": vnf_name,
+                "scaling-group-descriptor": scaling_group,
+            }
+            self.exec_op(ns_name, op_name='scale', op_data=op_data)
+        except ClientException as exc:
+            message="failed to scale vnf {} of ns {}:\nerror:\n{}".format(
+                    vnf_name, ns_name, exc.message)
+            raise ClientException(message)
+
     def create_alarm(self, alarm):
         data = {}
         data["create_alarm_request"] = {}