commit 70eeb18e4fcbb8bc3c81c88f270b59966ae4d463
author tierno <alfonso.tiernosepulveda@telefonica.com> Mon Oct 19 16:38:00 2020 +0000
committer tierno <alfonso.tiernosepulveda@telefonica.com> Wed Nov 25 18:32:36 2020 +0000
tree e78240816b0978d9448979cd8e8febc9ce3df557
parent 14e6be87a296db26c6e6d97d0ba4d308681e9033

Feature 7184 New Generation RO enhancemnt

New module vim_admin:
- check and load unattending ro_tasks
- check for vim updates and deletion in order to re-load it
- check vim_connectivity at creation edition
- Injection of ssh keys, retry if fails
- allow non load filesystem, because it is used only for cloud-init, but
it can be provided as text by LCM
- load sdn and wim targets
- sdn connectivity
- set network type 'data' when there are SRIOV or PT interfaces

Change-Id: I67147d1d500d60f0b2be1de214c97b1905168c8e
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

RO-plugin/osm_ro_plugin/openflow_conn.py

diff --git a/RO-plugin/osm_ro_plugin/openflow_conn.py b/RO-plugin/osm_ro_plugin/openflow_conn.py
index f7910c9..f60deea 100644
--- a/RO-plugin/osm_ro_plugin/openflow_conn.py
+++ b/RO-plugin/osm_ro_plugin/openflow_conn.py
@@ -162,6 +162,7 @@
     def __init__(self, wim, wim_account, config=None, logger=None, of_connector=None):
         self.logger = logger or logging.getLogger('openmano.sdn.openflow_conn')
         self.of_connector = of_connector
+        config = config or {}
         self.of_controller_nets_with_same_vlan = config.get("of_controller_nets_with_same_vlan", False)
 
     def check_credentials(self):

RO-plugin/osm_ro_plugin/sdn_dummy.py

diff --git a/RO-plugin/osm_ro_plugin/sdn_dummy.py b/RO-plugin/osm_ro_plugin/sdn_dummy.py
index 619a679..a2d189a 100644
--- a/RO-plugin/osm_ro_plugin/sdn_dummy.py
+++ b/RO-plugin/osm_ro_plugin/sdn_dummy.py
@@ -79,7 +79,7 @@
         """
         self.logger.debug("get_connectivity_service_status: service_uuid='{}' conn_info='{}'".format(service_uuid,
                                                                                                      conn_info))
-        return {'sdn_status': 'ACTIVE', 'sdn_info': self.connectivity.get(service_uuid)}
+        return {'sdn_status': 'ACTIVE', 'sdn_info': self.connections.get(service_uuid)}
 
     def create_connectivity_service(self, service_type, connection_points,
                                     **kwargs):

RO-plugin/osm_ro_plugin/vim_dummy.py

diff --git a/RO-plugin/osm_ro_plugin/vim_dummy.py b/RO-plugin/osm_ro_plugin/vim_dummy.py
index 3189239..e90d213 100644
--- a/RO-plugin/osm_ro_plugin/vim_dummy.py
+++ b/RO-plugin/osm_ro_plugin/vim_dummy.py
@@ -25,6 +25,7 @@
 from uuid import uuid4
 from copy import deepcopy
 import logging
+from random import randrange
 
 __author__ = "Alfonso Tierno"
 __date__ = "2020-04-20"
@@ -248,6 +249,12 @@
                 "vim_interface_id": str(iface_index),
                 "vim_net_id": iface["net_id"],
             }
+            if iface.get("type") in ("SR-IOV", "PCI-PASSTHROUGH") and self.config.get("sdn-port-mapping"):
+                compute_index = randrange(len(self.config["sdn-port-mapping"]))
+                port_index = randrange(len(self.config["sdn-port-mapping"][compute_index]["ports"]))
+                interface["compute_node"] = self.config["sdn-port-mapping"][compute_index]["compute_node"]
+                interface["pci"] = self.config["sdn-port-mapping"][compute_index]["ports"][port_index]["pci"]
+
             interfaces.append(interface)
         vm = {
             "id": vm_id,