From f38883e404eda8a3248b1416d09830ffde8277cb Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Fri, 20 Mar 2020 14:39:52 +0100 Subject: [PATCH] Pretty print json files in preload_data/ Fixing json files to conform to linter rules. Change-Id: I96d7f62152634cd63e8af76e56ab8fc89e766f74 Issue-ID: INT-1482 Signed-off-by: Bartek Grzybowski --- preload_data/defaults/preload_data.json | 28 +++--- preload_data/vFW/preload_data.json | 120 ++++++++++++------------ preload_data/vFWCL/preload_data.json | 66 +++++++------- preload_data/vFWDT/preload_data.json | 156 ++++++++++++++++---------------- preload_data/vIMS/preload_data.json | 44 ++++----- preload_data/vLB/preload_data.json | 80 ++++++++-------- preload_data/vVG/preload_data.json | 6 +- 7 files changed, 250 insertions(+), 250 deletions(-) diff --git a/preload_data/defaults/preload_data.json b/preload_data/defaults/preload_data.json index 3892ac16..f138fa33 100644 --- a/preload_data/defaults/preload_data.json +++ b/preload_data/defaults/preload_data.json @@ -1,16 +1,16 @@ { - "key_name": "vfw_key${uuid}", - "pub_key": "${GLOBAL_INJECTED_PUBLIC_KEY}", - "repo_url_blob": "https://nexus.onap.org/content/repositories/raw", - "repo_url_artifacts": "${GLOBAL_INJECTED_ARTIFACTS_REPO_URL}", - "demo_artifacts_version": "${GLOBAL_INJECTED_ARTIFACTS_VERSION}", - "onap_private_net_id": "${GLOBAL_INJECTED_NETWORK}", - "onap_private_subnet_id": "${GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID}", - "onap_private_net_cidr": "${GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR}", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "dcae_collector_ip": "${GLOBAL_INJECTED_DCAE_COLLECTOR_IP}", - "dcae_collector_port": "30235", - "public_net_id": "${GLOBAL_INJECTED_PUBLIC_NET_ID}", - "cloud_env": "${GLOBAL_INJECTED_CLOUD_ENV}", - "install_script_version": "${GLOBAL_INJECTED_SCRIPT_VERSION}" + "key_name": "vfw_key${uuid}", + "pub_key": "${GLOBAL_INJECTED_PUBLIC_KEY}", + "repo_url_blob": "https://nexus.onap.org/content/repositories/raw", + "repo_url_artifacts": "${GLOBAL_INJECTED_ARTIFACTS_REPO_URL}", + "demo_artifacts_version": "${GLOBAL_INJECTED_ARTIFACTS_VERSION}", + "onap_private_net_id": "${GLOBAL_INJECTED_NETWORK}", + "onap_private_subnet_id": "${GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID}", + "onap_private_net_cidr": "${GLOBAL_INJECTED_OPENSTACK_PRIVATE_NET_CIDR}", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "dcae_collector_ip": "${GLOBAL_INJECTED_DCAE_COLLECTOR_IP}", + "dcae_collector_port": "30235", + "public_net_id": "${GLOBAL_INJECTED_PUBLIC_NET_ID}", + "cloud_env": "${GLOBAL_INJECTED_CLOUD_ENV}", + "install_script_version": "${GLOBAL_INJECTED_SCRIPT_VERSION}" } diff --git a/preload_data/vFW/preload_data.json b/preload_data/vFW/preload_data.json index 4d6873c6..c980d7fc 100644 --- a/preload_data/vFW/preload_data.json +++ b/preload_data/vFW/preload_data.json @@ -1,61 +1,61 @@ { - "vfw_preload.template": { - "unprotected_private_net_id": "fwl01_unprotected${hostid}", - "unprotected_private_net_cidr": "192.168.110.0/24", - "protected_private_net_id": "fwl01_protected${hostid}", - "protected_private_net_cidr": "192.168.120.0/24", - "vfw_int_unprotected_private_ip_0": "192.168.110.100", - "vfw_int_protected_private_ip_0": "192.168.120.100", - "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.11", - "vfw_int_protected_private_floating_ip": "192.168.110.200", - "vpg_int_unprotected_private_ip_0": "192.168.110.200", - "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.12", - "vsn_int_protected_private_ip_0": "192.168.120.250", - "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.13", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "vfw_name_0": "fwl01fwl${hostid}", - "vpg_name_0": "fwl01pgn${hostid}", - "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_name_0": "fwl01snk${hostid}" - }, - "vfwsnk_preload.template": { - "int_unprotected_private_net_id": "fwlsnk_unprotected${hostid}", - "int_unprotected_private_subnet_id": "fwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr": "192.168.10.0/24", - "int_protected_private_net_id": "fwlsnk_protected${hostid}", - "int_protected_private_subnet_id": "fwlsnk_protected_sub${hostid}", - "protected_private_net_cidr": "192.168.20.0/24", - "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", - "vsn_int_protected_private_ip_0": "192.168.20.250", - "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.122", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "vfw_name_0": "fwl01fwl${hostid}", - "vsn_name_0": "fwl01snk${hostid}", - "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" - }, - "vpkg_preload.template": { - "unprotected_private_net_id": "vFWSNK_fwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id": "vFWSNK_fwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr": "192.168.10.0/24", - "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", - "vsn_private_ip_0": "192.168.20.250", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "vpg_name_0": "fwl01pgn${hostid}", - "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" - } -} \ No newline at end of file + "vfw_preload.template": { + "unprotected_private_net_id": "fwl01_unprotected${hostid}", + "unprotected_private_net_cidr": "192.168.110.0/24", + "protected_private_net_id": "fwl01_protected${hostid}", + "protected_private_net_cidr": "192.168.120.0/24", + "vfw_int_unprotected_private_ip_0": "192.168.110.100", + "vfw_int_protected_private_ip_0": "192.168.120.100", + "vfw_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.11", + "vfw_int_protected_private_floating_ip": "192.168.110.200", + "vpg_int_unprotected_private_ip_0": "192.168.110.200", + "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.12", + "vsn_int_protected_private_ip_0": "192.168.120.250", + "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.13", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "vfw_name_0": "fwl01fwl${hostid}", + "vpg_name_0": "fwl01pgn${hostid}", + "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_name_0": "fwl01snk${hostid}" + }, + "vfwsnk_preload.template": { + "int_unprotected_private_net_id": "fwlsnk_unprotected${hostid}", + "int_unprotected_private_subnet_id": "fwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "int_protected_private_net_id": "fwlsnk_protected${hostid}", + "int_protected_private_subnet_id": "fwlsnk_protected_sub${hostid}", + "protected_private_net_cidr": "192.168.20.0/24", + "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", + "vsn_int_protected_private_ip_0": "192.168.20.250", + "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.122", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "vfw_name_0": "fwl01fwl${hostid}", + "vsn_name_0": "fwl01snk${hostid}", + "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" + }, + "vpkg_preload.template": { + "unprotected_private_net_id": "vFWSNK_fwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id": "vFWSNK_fwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "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", + "vsn_private_ip_0": "192.168.20.250", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "vpg_name_0": "fwl01pgn${hostid}", + "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" + } +} diff --git a/preload_data/vFWCL/preload_data.json b/preload_data/vFWCL/preload_data.json index 65e274c0..4c96099e 100644 --- a/preload_data/vFWCL/preload_data.json +++ b/preload_data/vFWCL/preload_data.json @@ -1,35 +1,35 @@ -{ - "vfwsnk_preload.template": { - "int_unprotected_private_net_id" : "vofwlsnk_unprotected${hostid}", - "int_unprotected_private_subnet_id" : "vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "int_protected_private_net_id" : "vofwlsnk_protected${hostid}", - "int_protected_private_subnet_id" : "vofwlsnk_protected_sub${hostid}", - "protected_private_net_cidr" : "192.168.20.0/24", - "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", - "vsn_int_protected_private_ip_0" : "192.168.20.250", - "vsn_onap_private_ip_0" : "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.102", - "vfw_name_0": "vofwl01fwl${hostid}", - "vsn_name_0": "vofwl01snk${hostid}", - "vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vfw_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "vsn_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vsn_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}" - }, +{ + "vfwsnk_preload.template": { + "int_unprotected_private_net_id": "vofwlsnk_unprotected${hostid}", + "int_unprotected_private_subnet_id": "vofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "int_protected_private_net_id": "vofwlsnk_protected${hostid}", + "int_protected_private_subnet_id": "vofwlsnk_protected_sub${hostid}", + "protected_private_net_cidr": "192.168.20.0/24", + "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", + "vsn_int_protected_private_ip_0": "192.168.20.250", + "vsn_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.102", + "vfw_name_0": "vofwl01fwl${hostid}", + "vsn_name_0": "vofwl01snk${hostid}", + "vfw_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vfw_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vsn_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vsn_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" + }, "vpkg_preload.template": { - "unprotected_private_net_id" : "vFWSNK_vofwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vFWSNK_vofwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "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", - "vsn_private_ip_0" : "192.168.20.250", - "vpg_name_0" : "vofwl01pgn${hostid}", - "vpg_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "vpg_flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}" - } + "unprotected_private_net_id": "vFWSNK_vofwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id": "vFWSNK_vofwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "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", + "vsn_private_ip_0": "192.168.20.250", + "vpg_name_0": "vofwl01pgn${hostid}", + "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}" + } } diff --git a/preload_data/vFWDT/preload_data.json b/preload_data/vFWDT/preload_data.json index fc0aa48a..c8df4d08 100644 --- a/preload_data/vFWDT/preload_data.json +++ b/preload_data/vFWDT/preload_data.json @@ -1,80 +1,80 @@ { - "vfwdt_vpkg_preload.template": { - "unprotected_private_net_id": "vfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id": "vfwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vpg_name_0": "vfwl01pgn${hostid}", - "vfw_name_0": "vfwl01vfw${hostid}", - "vsn_name_0": "vfwl01snk${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id" : "vfwlsnk01_protected${hostid}", - "protected_private_subnet_id" : "vfwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1": "192.168.20.100", - "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_2" : "10.100.100.2", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1": "10.0.110.3", - "vsn_private_ip_2": "10.100.100.3" - }, - "vfwdt_vfwsnk0_preload.template": { - "unprotected_private_net_id": "vfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id": "vfwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vpg_name_0": "vfwl01pgn${hostid}", - "vsn_name_0": "vfwl01snk${hostid}", - "vfw_name_0": "vfwl01vfw${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id": "vfwlsnk01_protected${hostid}", - "protected_private_subnet_id": "vfwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_0" : "192.168.10.100", - "vfw_private_ip_1": "192.168.20.100", - "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_2": "10.100.100.2", - "vsn_private_ip_0" : "192.168.20.250", - "vsn_private_ip_1": "10.0.110.3", - "vsn_private_ip_2": "10.100.100.3" - }, - "vfwdt_vfwsnk1_preload.template": { - "unprotected_private_net_id" : "vfwlsnk_unprotected${hostid}", - "unprotected_private_subnet_id" : "vfwlsnk_unprotected_sub${hostid}", - "unprotected_private_net_cidr" : "192.168.10.0/24", - "protected_private_net_cidr" : "192.168.20.0/24", - "vpg_name_0": "vfwl02pgn${hostid}", - "vsn_name_0": "vfwl02snk${hostid}", - "vfw_name_0": "vfwl02vfw${hostid}", - "image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}", - "protected_private_net_id": "vfwlsnk01_protected${hostid}", - "protected_private_subnet_id": "vfwlsnk01_protected_sub${hostid}", - "ext_private_net_id": "onap_oam_ext", - "ext_private_subnet_id": "onap_oam_ext", - "ext_private_net_cidr": "10.100.0.0/16", - "vfw_private_ip_0" : "192.168.10.110", - "vfw_private_ip_1": "192.168.20.110", - "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_2": "10.100.100.2", - "vsn_private_ip_0": "192.168.20.240", - "vsn_private_ip_1": "10.0.110.5", - "vsn_private_ip_2": "10.100.100.5" - } + "vfwdt_vpkg_preload.template": { + "unprotected_private_net_id": "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id": "vfwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "protected_private_net_cidr": "192.168.20.0/24", + "vpg_name_0": "vfwl01pgn${hostid}", + "vfw_name_0": "vfwl01vfw${hostid}", + "vsn_name_0": "vfwl01snk${hostid}", + "image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "protected_private_net_id": "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id": "vfwlsnk01_protected_sub${hostid}", + "ext_private_net_id": "onap_oam_ext", + "ext_private_subnet_id": "onap_oam_ext", + "ext_private_net_cidr": "10.100.0.0/16", + "vfw_private_ip_0": "192.168.10.100", + "vfw_private_ip_1": "192.168.20.100", + "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_2": "10.100.100.2", + "vsn_private_ip_0": "192.168.20.250", + "vsn_private_ip_1": "10.0.110.3", + "vsn_private_ip_2": "10.100.100.3" + }, + "vfwdt_vfwsnk0_preload.template": { + "unprotected_private_net_id": "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id": "vfwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "protected_private_net_cidr": "192.168.20.0/24", + "vpg_name_0": "vfwl01pgn${hostid}", + "vsn_name_0": "vfwl01snk${hostid}", + "vfw_name_0": "vfwl01vfw${hostid}", + "image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "protected_private_net_id": "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id": "vfwlsnk01_protected_sub${hostid}", + "ext_private_net_id": "onap_oam_ext", + "ext_private_subnet_id": "onap_oam_ext", + "ext_private_net_cidr": "10.100.0.0/16", + "vfw_private_ip_0": "192.168.10.100", + "vfw_private_ip_1": "192.168.20.100", + "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_2": "10.100.100.2", + "vsn_private_ip_0": "192.168.20.250", + "vsn_private_ip_1": "10.0.110.3", + "vsn_private_ip_2": "10.100.100.3" + }, + "vfwdt_vfwsnk1_preload.template": { + "unprotected_private_net_id": "vfwlsnk_unprotected${hostid}", + "unprotected_private_subnet_id": "vfwlsnk_unprotected_sub${hostid}", + "unprotected_private_net_cidr": "192.168.10.0/24", + "protected_private_net_cidr": "192.168.20.0/24", + "vpg_name_0": "vfwl02pgn${hostid}", + "vsn_name_0": "vfwl02snk${hostid}", + "vfw_name_0": "vfwl02vfw${hostid}", + "image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "protected_private_net_id": "vfwlsnk01_protected${hostid}", + "protected_private_subnet_id": "vfwlsnk01_protected_sub${hostid}", + "ext_private_net_id": "onap_oam_ext", + "ext_private_subnet_id": "onap_oam_ext", + "ext_private_net_cidr": "10.100.0.0/16", + "vfw_private_ip_0": "192.168.10.110", + "vfw_private_ip_1": "192.168.20.110", + "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_2": "10.100.100.2", + "vsn_private_ip_0": "192.168.20.240", + "vsn_private_ip_1": "10.0.110.5", + "vsn_private_ip_2": "10.100.100.5" + } } diff --git a/preload_data/vIMS/preload_data.json b/preload_data/vIMS/preload_data.json index 410b4407..04ca8afe 100644 --- a/preload_data/vIMS/preload_data.json +++ b/preload_data/vIMS/preload_data.json @@ -1,23 +1,23 @@ { - "vims_preload.template": { - "bono_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "sprout_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homer_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "homestead_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ralf_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "ellis_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "dns_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", - "bono_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "sprout_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "homer_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "homestead_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "ralf_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "ellis_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "dns_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "repo_url": "http://repo.cw-ngv.com/stable", - "zone": "me.cw-ngv.com", - "dn_range_start": "2425550000", - "dn_range_length": "10000", - "dnssec_key": "9FPdYTWhk5+LbhrqtTPQKw==" - } -} \ No newline at end of file + "vims_preload.template": { + "bono_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "sprout_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "homer_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "homestead_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "ralf_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "ellis_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "dns_image_name": "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}", + "bono_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "sprout_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "homer_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "homestead_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "ralf_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "ellis_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "dns_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "repo_url": "http://repo.cw-ngv.com/stable", + "zone": "me.cw-ngv.com", + "dn_range_start": "2425550000", + "dn_range_length": "10000", + "dnssec_key": "9FPdYTWhk5+LbhrqtTPQKw==" + } +} diff --git a/preload_data/vLB/preload_data.json b/preload_data/vLB/preload_data.json index f7c74ac9..cb64863d 100644 --- a/preload_data/vLB/preload_data.json +++ b/preload_data/vLB/preload_data.json @@ -1,42 +1,42 @@ { - "vlb_preload.template": { - "vlb_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vlb_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vdns_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vdns_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", - "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", - "vlb_name_0": "vlblb${hostid}", - "vdns_name_0": "vlbdns${hostid}", - "vpg_name_0": "clvlbpgn${hostid}", - "vlb_private_net_id": "lb01_private${hostid}", - "vlb_private_net_cidr": "192.168.30.0/24", - "pktgen_private_net_id": "lb01_pktgen${hostid}", - "pktgen_private_net_cidr": "192.168.9.0/24", - "vlb_int_private_ip_0": "192.168.30.100", - "vlb_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.24", - "vlb_int_pktgen_private_ip_0": "192.168.9.111", - "vdns_int_private_ip_0": "192.168.30.110", - "vdns_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.25", - "vpg_int_pktgen_private_ip_0": "192.168.9.110", - "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.27", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "pg_int": "192.168.9.109", - "vip": "192.168.9.112", - "gre_ipaddr": "192.168.30.112", - "vnf_id": "vLoadBalancer_${hostid}", - "vf_module_id": "vLoadBalancer" - }, - "dnsscaling_preload.template": { - "int_private_net_id": "vLBMS_lb01_private${hostid}", - "int_private_subnet_id": "vLBMS_lb01_private${hostid}_subnet", - "vlb_int_private_ip_0": "192.168.30.100", - "vlb_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.24", - "vlb_int_pktgen_private_ip_0": "192.168.9.111", - "vdns_int_private_ip_0": "192.168.30.222", - "vdns_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.26", - "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", - "vdns_name_0": "vlbscaling${hostid}", - "vlb_private_net_cidr": "192.168.10.0/24" - } + "vlb_preload.template": { + "vlb_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vlb_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vdns_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vdns_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vpg_image_name": "${GLOBAL_INJECTED_UBUNTU_1604_IMAGE}", + "vpg_flavor_name": "${GLOBAL_INJECTED_VM_FLAVOR}", + "vlb_name_0": "vlblb${hostid}", + "vdns_name_0": "vlbdns${hostid}", + "vpg_name_0": "clvlbpgn${hostid}", + "vlb_private_net_id": "lb01_private${hostid}", + "vlb_private_net_cidr": "192.168.30.0/24", + "pktgen_private_net_id": "lb01_pktgen${hostid}", + "pktgen_private_net_cidr": "192.168.9.0/24", + "vlb_int_private_ip_0": "192.168.30.100", + "vlb_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.24", + "vlb_int_pktgen_private_ip_0": "192.168.9.111", + "vdns_int_private_ip_0": "192.168.30.110", + "vdns_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.25", + "vpg_int_pktgen_private_ip_0": "192.168.9.110", + "vpg_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.27", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "pg_int": "192.168.9.109", + "vip": "192.168.9.112", + "gre_ipaddr": "192.168.30.112", + "vnf_id": "vLoadBalancer_${hostid}", + "vf_module_id": "vLoadBalancer" + }, + "dnsscaling_preload.template": { + "int_private_net_id": "vLBMS_lb01_private${hostid}", + "int_private_subnet_id": "vLBMS_lb01_private${hostid}_subnet", + "vlb_int_private_ip_0": "192.168.30.100", + "vlb_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.24", + "vlb_int_pktgen_private_ip_0": "192.168.9.111", + "vdns_int_private_ip_0": "192.168.30.222", + "vdns_onap_private_ip_0": "${GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX}.${ecompnet}.26", + "sec_group": "${GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}", + "vdns_name_0": "vlbscaling${hostid}", + "vlb_private_net_cidr": "192.168.10.0/24" + } } diff --git a/preload_data/vVG/preload_data.json b/preload_data/vVG/preload_data.json index a73681d3..52321157 100644 --- a/preload_data/vVG/preload_data.json +++ b/preload_data/vVG/preload_data.json @@ -1,5 +1,5 @@ { - "vvg_preload.template": { - "nova_instance": "${server_id}" - } + "vvg_preload.template": { + "nova_instance": "${server_id}" + } } -- 2.16.6