Implemented option to disable port-security for openstack. Implemented option to...

[osm/RO.git] / nfvo.py

diff --git a/nfvo.py b/nfvo.py
index 0d60ff7..e64ba1c 100644 (file)
--- a/nfvo.py
+++ b/nfvo.py
@@ -1481,6 +1481,10 @@ def start_scenario(mydb, tenant_id, scenario_id, instance_scenario_name, instanc
                         netDict['vpci'] = iface['vpci']
                     if "mac" in iface and iface["mac"] is not None:
                         netDict['mac_address'] = iface['mac']
+                    if "port-security" in iface and iface["port-security"] is not None:
+                        netDict['port_security'] = iface['port-security']
+                    if "floating-ip" in iface and iface["floating-ip"] is not None:
+                        netDict['floating_ip'] = iface['floating-ip']
                     netDict['name'] = iface['internal_name']
                     if iface['net_id'] is None:
                         for vnf_iface in sce_vnf["interfaces"]:
@@ -2001,6 +2005,11 @@ def create_instance(mydb, tenant_id, instance_dict):
                         netDict['vpci'] = iface['vpci']
                     if "mac" in iface and iface["mac"] is not None:
                         netDict['mac_address'] = iface['mac']
+                    logger.debug("Pablo iface %s", str(iface))
+                    if "port-security" in iface and iface["port-security"] is not None:
+                        netDict['port_security'] = iface['port-security']
+                    if "floating-ip" in iface and iface["floating-ip"] is not None:
+                        netDict['floating_ip'] = iface['floating-ip']
                     netDict['name'] = iface['internal_name']
                     if iface['net_id'] is None:
                         for vnf_iface in sce_vnf["interfaces"]: