Merge "Remove deprecated juju api interface"

diff --git a/lcm/osm_lcm/lcm.py b/lcm/osm_lcm/lcm.py
index d2a560b..2b62c1f 100644 (file)
--- a/lcm/osm_lcm/lcm.py
+++ b/lcm/osm_lcm/lcm.py
@@ -744,6 +744,20 @@ class Lcm:
                 vnf_index = str(c_vnf["member-vnf-index"])
                 vnfd = needed_vnfd[vnfd_id]
 
+                # Check if this VNF has a charm configuration
+                vnf_config = vnfd.get("vnf-configuration")
+
+                if vnf_config and vnf_config.get("juju"):
+                    proxy_charm = vnf_config["juju"]["charm"]
+                    params = {}
+
+                    if proxy_charm:
+                        if 'initial-config-primitive' in vnf_config:
+                            params['initial-config-primitive'] = vnf_config['initial-config-primitive']
+
+                        deploy()
+                        number_to_configure += 1
+
                 # Deploy charms for each VDU that supports one.
                 for vdu in vnfd['vdu']:
                     vdu_config = vdu.get('vdu-configuration')
@@ -756,22 +770,9 @@ class Lcm:
                         if 'initial-config-primitive' in vdu_config:
                             params['initial-config-primitive'] = vdu_config['initial-config-primitive']
 
-                    else:
-                        # If a VDU doesn't declare it's own charm, check
-                        # if the VNF does and deploy that instead.
-
-                        # Check if this VNF has a charm configuration
-                        vnf_config = vnfd.get("vnf-configuration")
-
-                        if vnf_config and vnf_config.get("juju"):
-                            proxy_charm = vnf_config["juju"]["charm"]
-
-                            if 'initial-config-primitive' in vnf_config:
-                                params['initial-config-primitive'] = vnf_config['initial-config-primitive']
-
-                    if proxy_charm:
-                        deploy()
-                        number_to_configure += 1
+                        if proxy_charm:
+                            deploy()
+                            number_to_configure += 1
 
             db_nsr["config-status"] = "configuring" if number_to_configure else "configured"
             db_nsr["detailed-status"] = "configuring: init: {}".format(number_to_configure) if number_to_configure else "done"

diff --git a/osm_ro/vimconn_opennebula.py b/osm_ro/vimconn_opennebula.py
index eaf3021..ab4ebf4 100644 (file)
--- a/osm_ro/vimconn_opennebula.py
+++ b/osm_ro/vimconn_opennebula.py
@@ -293,9 +293,9 @@ class vimconnector(vimconn.vimconnector):
                 network_id_filter = None
             for network in networkList:
                 match = False
-                if network.name == network_name_filter and network.id == network_id_filter:
+                if network.name == network_name_filter and str(network.id) == str(network_id_filter):
                     match = True
-                if network_name_filter is None and network.id == network_id_filter:
+                if network_name_filter is None and str(network.id) == str(network_id_filter):
                     match = True
                 if network_id_filter is None and network.name == network_name_filter:
                     match = True
@@ -429,9 +429,9 @@ class vimconnector(vimconn.vimconnector):
                 image_id_filter = None
             for image in image_pool:
                 match = False
-                if str(image_name_filter) == str(image.name) and image.id == image_id_filter:
+                if str(image_name_filter) == str(image.name) and str(image.id) == str(image_id_filter):
                     match = True
-                if image_name_filter is None and image.id == image_id_filter:
+                if image_name_filter is None and str(image.id) == str(image_id_filter):
                     match = True
                 if image_id_filter is None and str(image_name_filter) == str(image.name):
                     match = True
@@ -506,9 +506,10 @@ class vimconnector(vimconn.vimconnector):
         try:
             client = oca.Client(self.user + ':' + self.passwd, self.url)
             vm_pool = oca.VirtualMachinePool(client)
+            vm_pool.info()
             vm_exist = False
             for i in vm_pool:
-                if i.id == vm_id:
+                if str(i.id) == str(vm_id):
                     vm_exist = True
                     break
             if not vm_exist:
@@ -555,7 +556,7 @@ class vimconnector(vimconn.vimconnector):
                 vm_exist = False
                 vm_element = None
                 for i in vm_pool:
-                    if i.id == vm_id:
+                    if str(i.id) == str(vm_id):
                         vm_exist = True
                         vm_element = i
                         break
@@ -652,3 +653,4 @@ class vimconnector(vimconn.vimconnector):
     #         return console_dict
     #     except vimconn.vimconnException as e:
     #         self.logger.error(e)
+