X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvimconn_vmware.py;h=f9ff2fef858abe9a3561c039bd66a27f6f7a0b92;hb=f716aeaa85e65b5d23567d3dea6455bac2377e26;hp=910387d29d8a9cc5e77b705bd97a0d9717ec6e09;hpb=0c007d6e259c2ff1cdc6be0e1d95ec17e709fae4;p=osm%2FRO.git
diff --git a/osm_ro/vimconn_vmware.py b/osm_ro/vimconn_vmware.py
index 910387d2..f9ff2fef 100644
--- a/osm_ro/vimconn_vmware.py
+++ b/osm_ro/vimconn_vmware.py
@@ -754,6 +754,13 @@ class vimconnector(vimconn.vimconnector):
cpu = flavor_data.get(FLAVOR_VCPUS_KEY, 1)
disk = flavor_data.get(FLAVOR_DISK_KEY, 1)
+ if not isinstance(ram, int):
+ raise vimconn.vimconnException("Non-integer value for ram")
+ elif not isinstance(cpu, int):
+ raise vimconn.vimconnException("Non-integer value for cpu")
+ elif not isinstance(disk, int):
+ raise vimconn.vimconnException("Non-integer value for disk")
+
extended_flv = flavor_data.get("extended")
if extended_flv:
numas=extended_flv.get("numas")
@@ -2751,6 +2758,11 @@ class vimconnector(vimconn.vimconnector):
#Unused in case of Underlay (data/ptp) network interface.
fence_mode="bridged"
is_inherited='false'
+ dns_list = dns_address.split(";")
+ dns1 = dns_list[0]
+ dns2_text = ""
+ if len(dns_list) >= 2:
+ dns2_text = "\n {}\n".format(dns_list[1])
data = """
Openmano created
@@ -2759,22 +2771,22 @@ class vimconnector(vimconn.vimconnector):
{1:s}
{2:s}
{3:s}
- {4:s}
- {5:s}
+ {4:s}{5:s}
+ {6:s}
- {6:s}
- {7:s}
+ {7:s}
+ {8:s}
-
- {9:s}
+
+ {10:s}
- {10:s}
+ {11:s}
""".format(escape(network_name), is_inherited, gateway_address,
- subnet_address, dns_address, dhcp_enabled,
+ subnet_address, dns1, dns2_text, dhcp_enabled,
dhcp_start_address, dhcp_end_address, available_networks,
fence_mode, isshared)