From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 26 Oct 2021 16:38:49 +0000 (+0200)
Subject: Fix bug 1724 to indicate region during NIC creation in Azure connector
X-Git-Tag: v10.1.0-rc1~16
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ecad630a40530bf8af1fcff04da93daf477a59e0;p=osm%2FRO.git

Fix bug 1724 to indicate region during NIC creation in Azure connector

Change-Id: I45d68d1ea840fa6f64030a1f85839d89fa6d406e
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
index c78b0f92..a1d3aa82 100755
--- a/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
+++ b/RO-VIM-azure/osm_rovim_azure/vimconn_azure.py
@@ -229,14 +229,6 @@ class vimconnector(vimconn.VimConnector):
         else:
             raise vimconn.VimConnException("Subscription not specified")
 
-        # REGION
-        if "region_name" in config:
-            self.region = config.get("region_name")
-        else:
-            raise vimconn.VimConnException(
-                "Azure region_name is not specified at config"
-            )
-
         # RESOURCE_GROUP
         if "resource_group" in config:
             self.resource_group = config.get("resource_group")
@@ -245,6 +237,14 @@ class vimconnector(vimconn.VimConnector):
                 "Azure resource_group is not specified at config"
             )
 
+        # REGION
+        if "region_name" in config:
+            self.region = config.get("region_name")
+        else:
+            raise vimconn.VimConnException(
+                "Azure region_name is not specified at config"
+            )
+
         # VNET_NAME
         if "vnet_name" in config:
             self.vnet_name = config["vnet_name"]
@@ -543,12 +543,12 @@ class vimconnector(vimconn.VimConnector):
 
         return name
 
-    def _create_nic(self, net, nic_name, static_ip=None, created_items={}):
+    def _create_nic(self, net, nic_name, region=None, static_ip=None, created_items={}):
         self.logger.debug("create nic name %s, net_name %s", nic_name, net)
         self._reload_connection()
 
         subnet_id = net["net_id"]
-        location = self._get_location_from_resource_group(self.resource_group)
+        location = self.region or self._get_location_from_resource_group(self.resource_group)
         try:
             net_ifz = {"location": location}
             net_ip_config = {
@@ -903,7 +903,7 @@ class vimconnector(vimconn.VimConnector):
                 # subnet_id=net["net_id"]
                 nic_name = vm_name + "-nic-" + str(idx)
                 vm_nic, nic_items = self._create_nic(
-                    net, nic_name, net.get("ip_address"), created_items
+                    net, nic_name, self.region, net.get("ip_address"), created_items
                 )
                 vm_nics.append({"id": str(vm_nic.id)})
                 net["vim_id"] = vm_nic.id