From 2b0a6121cb3398a1dd1baa5fd221374e90db5ce7 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Wed, 15 Apr 2020 12:48:47 -0500 Subject: [PATCH] Compress IP assignments Issue-ID: INT-1527 Change-Id: Iace03cdd6e79780c9df78b2648af3f476698c889 Signed-off-by: Brian Freeman --- preload_data/vFW/preload_data.json | 6 +++--- preload_data/vFWCL/preload_data.json | 6 +++--- preload_data/vFWDT/preload_data.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/preload_data/vFW/preload_data.json b/preload_data/vFW/preload_data.json index c980d7fc..b318a4a2 100644 --- a/preload_data/vFW/preload_data.json +++ b/preload_data/vFW/preload_data.json @@ -33,9 +33,9 @@ "vfw_int_unprotected_private_ip_0": "192.168.10.100", "vfw_int_protected_private_floating_ip": "192.168.10.200", "vfw_int_protected_private_ip_0": "192.168.20.100", - "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.121", + "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.21", "vsn_int_protected_private_ip_0": "192.168.20.250", - "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.122", + "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.22", "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", "vfw_name_0": "fwl01fwl${hostid}", "vsn_name_0": "fwl01snk${hostid}", @@ -51,7 +51,7 @@ "protected_private_net_cidr": "192.168.20.0/24", "vfw_private_ip_0": "192.168.10.100", "vpg_unprotected_private_ip_0": "192.168.10.200", - "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.123", + "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.23", "vsn_private_ip_0": "192.168.20.250", "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", "vpg_name_0": "fwl01pgn${hostid}", diff --git a/preload_data/vFWCL/preload_data.json b/preload_data/vFWCL/preload_data.json index 4c96099e..eab03408 100644 --- a/preload_data/vFWCL/preload_data.json +++ b/preload_data/vFWCL/preload_data.json @@ -9,9 +9,9 @@ "vfw_int_unprotected_private_ip_0": "192.168.10.100", "vfw_int_protected_private_floating_ip": "192.168.10.200", "vfw_int_protected_private_ip_0": "192.168.20.100", - "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.101", + "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.31", "vsn_int_protected_private_ip_0": "192.168.20.250", - "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.102", + "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.32", "vfw_name_0": "vofwl01fwl${hostid}", "vsn_name_0": "vofwl01snk${hostid}", "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", @@ -26,7 +26,7 @@ "protected_private_net_cidr": "192.168.20.0/24", "vfw_private_ip_0": "192.168.10.100", "vpg_unprotected_private_ip_0": "192.168.10.200", - "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.103", + "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.33", "vsn_private_ip_0": "192.168.20.250", "vpg_name_0": "vofwl01pgn${hostid}", "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", diff --git a/preload_data/vFWDT/preload_data.json b/preload_data/vFWDT/preload_data.json index c8df4d08..44742bd9 100644 --- a/preload_data/vFWDT/preload_data.json +++ b/preload_data/vFWDT/preload_data.json @@ -19,7 +19,7 @@ "vfw_private_ip_2": "10.0.110.1", "vfw_private_ip_3": "10.100.100.1", "vpg_private_ip_0": "192.168.10.200", - "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.103", + "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.33", "vpg_private_ip_2": "10.100.100.2", "vsn_private_ip_0": "192.168.20.250", "vsn_private_ip_1": "10.0.110.3", @@ -45,7 +45,7 @@ "vfw_private_ip_2": "10.0.110.1", "vfw_private_ip_3": "10.100.100.1", "vpg_private_ip_0": "192.168.10.200", - "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.103", + "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.33", "vpg_private_ip_2": "10.100.100.2", "vsn_private_ip_0": "192.168.20.250", "vsn_private_ip_1": "10.0.110.3", @@ -71,7 +71,7 @@ "vfw_private_ip_2": "10.0.110.4", "vfw_private_ip_3": "10.100.100.4", "vpg_private_ip_0": "192.168.10.200", - "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.103", + "vpg_private_ip_1": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.33", "vpg_private_ip_2": "10.100.100.2", "vsn_private_ip_0": "192.168.20.240", "vsn_private_ip_1": "10.0.110.5", -- 2.16.6