Backwards compatibility with old descriptors; updated override flags in vnfd/nsd...

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

diff --git a/osmclient/sol005/vnfd.py b/osmclient/sol005/vnfd.py
index 9eb18ca..f80c000 100644 (file)
--- a/osmclient/sol005/vnfd.py
+++ b/osmclient/sol005/vnfd.py
@@ -67,6 +67,8 @@ class Vnfd(object):
             for vnfd in self.list():
                 if 'product-name' in vnfd and name == vnfd['product-name']:
                     return vnfd
+                elif 'name' in vnfd and name == vnfd['name']:
+                    return vnfd
         raise NotFound("vnfd {} not found".format(name))
 
     def get_individual(self, name):
@@ -194,40 +196,38 @@ class Vnfd(object):
 
                 for vcd_number, vcd in enumerate(vcd_list):
                     if override_epa:
-                        virtual_memory = {
-                            "mempage-size": "LARGE",
-                            "numa-node-policy": {
-                                "node-cnt": 1,
-                                "mem-policy": "STRICT"
-                            }
+                        virtual_memory = vcd["virtual-memory"]
+                        virtual_memory["mempage-size"] = "LARGE"
+                        virtual_memory["numa-enabled"] = True
+                        virtual_memory["numa-node-policy"] = {
+                            "node-cnt": 1,
+                            "mem-policy": "STRICT"
                         }
-                        virtual_cpu = {
-                            "pinning": {
-                                "policy": "static",
-                                "thread-policy": "PREFER"
-                            }
+                        virtual_cpu = vcd["virtual-cpu"]
+                        virtual_cpu["pinning"] = {
+                            "policy": "static",
+                            "thread-policy": "PREFER"
                         }
 
-                        memory_override_string = "virtual-compute-desc.{}.virtual-cpu={};"\
+                        cpu_override_string = "virtual-compute-desc.{}.virtual-cpu={};"\
                                                  .format(vcd_number, quote(yaml.safe_dump(virtual_cpu)))
-                        cpu_override_string = "virtual-compute-desc.{}.virtual-memory={};"\
+                        memory_override_string = "virtual-compute-desc.{}.virtual-memory={};"\
                                               .format(vcd_number, quote(yaml.safe_dump(virtual_memory)))
                         special_override_string = "{}{}{}".format(special_override_string,
                                                                   cpu_override_string, memory_override_string)
 
-                        headers['Query-String-Format'] = 'yaml'
+                    headers['Query-String-Format'] = 'yaml'
                     if override_nonepa:
-                        virtual_memory = {
-                            "mempage-size": "",
-                            "numa-node-policy": {}
-                        }
-                        virtual_cpu = {
-                            "pinning": {}
-                        }
+                        virtual_memory = vcd["virtual-memory"]
+                        virtual_memory["mempage-size"] = ""
+                        virtual_memory["numa-enabled"] = ""
+                        virtual_memory["numa-node-policy"] = {}
+                        virtual_cpu = vcd["virtual-cpu"]
+                        virtual_cpu["pinning"] = {}
 
-                        memory_override_string = "virtual-compute-desc.{}.virtual-cpu={};"\
+                        cpu_override_string = "virtual-compute-desc.{}.virtual-cpu={};"\
                                                  .format(vcd_number, quote(yaml.safe_dump(virtual_cpu)))
-                        cpu_override_string = "virtual-compute-desc.{}.virtual-memory={};"\
+                        memory_override_string = "virtual-compute-desc.{}.virtual-memory={};"\
                                               .format(vcd_number, quote(yaml.safe_dump(virtual_memory)))
                         special_override_string = "{}{}{}".format(special_override_string,
                                                                   cpu_override_string, memory_override_string)