summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2018-08-28 10:00:30 -0500
committerBrian Freeman <bf1936@att.com>2018-08-28 10:00:40 -0500
commit34cdc2249d76d164fa03fe3e1d088cefe2a3f5dc (patch)
tree91c4911df3faa2d6f8cbd658ae96fe7ac921fa47
parent7929668517ccecdc0f030be41fcef76c0fe528d8 (diff)
Updates for SO integration & sec_group
Issue-ID: INT-621 Change-Id: Iad87a8ce5cb0058a82e6b96c84c6e5411ce08b2f Signed-off-by: Brian Freeman <bf1936@att.com>
-rw-r--r--boot/robot/integration_preload_parameters.py16
-rw-r--r--boot/robot/integration_robot_properties.py3
-rw-r--r--heat/ONAP/onap_openstack.yaml2
3 files changed, 20 insertions, 1 deletions
diff --git a/boot/robot/integration_preload_parameters.py b/boot/robot/integration_preload_parameters.py
index 5d3e3c86..108d470f 100644
--- a/boot/robot/integration_preload_parameters.py
+++ b/boot/robot/integration_preload_parameters.py
@@ -9,6 +9,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
"onap_private_subnet_id" : "${GLOBAL_INJECTED_NETWORK}",
"onap_private_net_cidr" : "10.0.0.0/8",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
"dcae_collector_ip" : "${GLOBAL_INJECTED_DCAE_COLLECTOR_IP}",
"dcae_collector_port" : "8080",
"public_net_id" : "${GLOBAL_INJECTED_PUBLIC_NET_ID}",
@@ -32,6 +33,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_1" : "10.0.${ecompnet}.2",
"vsn_private_ip_0" : "192.168.20.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.3",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'vofwl01fwl${hostid}',
'vpg_name_0':'vofwl01pgn${hostid}',
"vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -51,6 +53,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_0" : "192.168.10.200",
"vsn_private_ip_0" : "192.168.20.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.102",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'vofwl01fwl${hostid}',
'vsn_name_0':'vofwl01snk${hostid}',
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -65,6 +68,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_0" : "192.168.10.200",
"vpg_private_ip_1" : "10.0.${ecompnet}.103",
"vsn_private_ip_0" : "192.168.20.250",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vpg_name_0':'vofwl01pgn${hostid}',
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -79,6 +83,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.4",
"vdns_private_ip_0" : "192.168.30.110",
"vdns_private_ip_1" : "10.0.${ecompnet}.5",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vlb_name_0':'vovlblb${hostid}',
'vdns_name_0':'vovlbdns${hostid}',
"pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -99,6 +104,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.4",
"vdns_private_ip_0" : "192.168.30.222",
"vdns_private_ip_1" : "10.0.${ecompnet}.6",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'scaling_vdns_name_0':'vovlbscaling${hostid}',
"vlb_private_net_cidr" : "192.168.10.0/24"
},
@@ -141,6 +147,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_1" : "10.0.${ecompnet}.12",
"vsn_private_ip_0" : "192.168.120.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.13",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'clfwl01fwl${hostid}',
'vpg_name_0':'clfwl01pgn${hostid}',
"vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -160,6 +167,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_0" : "192.168.10.200",
"vsn_private_ip_0" : "192.168.20.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.112",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'clfwl01fwl${hostid}',
'vsn_name_0':'clfwl01snk${hostid}',
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -174,6 +182,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_0" : "192.168.10.200",
"vpg_private_ip_1" : "10.0.${ecompnet}.113",
"vsn_private_ip_0" : "192.168.20.250",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vpg_name_0':'clfwl01pgn${hostid}',
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}",
@@ -188,6 +197,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.14",
"vdns_private_ip_0" : "192.168.30.110",
"vdns_private_ip_1" : "10.0.${ecompnet}.15",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vlb_name_0':'clvlblb${hostid}',
'vdns_name_0':'clvlbdns${hostid}',
"pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -207,6 +217,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.14",
"vdns_private_ip_0" : "192.168.130.222",
"vdns_private_ip_1" : "10.0.${ecompnet}.16",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'scaling_vdns_name_0':'clvlbscaling${hostid}',
"vlb_private_net_cidr" : "192.168.10.0/24"
},
@@ -248,6 +259,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_1" : "10.0.${ecompnet}.12",
"vsn_private_ip_0" : "192.168.120.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.13",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'demofwl01fwl',
'vpg_name_0':'demofwl01pgn',
"vfw_image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -267,6 +279,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_0" : "192.168.10.200",
"vsn_private_ip_0" : "192.168.20.250",
"vsn_private_ip_1" : "10.0.${ecompnet}.122",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vfw_name_0':'demofwl01fwl${hostid}',
'vsn_name_0':'demofwl01snk${hostid}',
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
@@ -282,6 +295,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vpg_private_ip_1" : "10.0.${ecompnet}.123",
"vsn_private_ip_0" : "192.168.20.250",
'vpg_name_0':'demofwl01pgn${hostid}',
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
"image_name" : "${GLOBAL_INJECTED_UBUNTU_1404_IMAGE}",
"flavor_name" : "${GLOBAL_INJECTED_VM_FLAVOR}"
},
@@ -295,6 +309,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.24",
"vdns_private_ip_0" : "192.168.30.110",
"vdns_private_ip_1" : "10.0.${ecompnet}.25",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'vlb_name_0':'demovlblb${hostid}',
'vdns_name_0':'demovlbdns${hostid}',
"pktgen_private_net_cidr" : "192.168.9.0/24",
@@ -314,6 +329,7 @@ GLOBAL_PRELOAD_PARAMETERS = {
"vlb_private_ip_1" : "10.0.${ecompnet}.24",
"vdns_private_ip_0" : "192.168.130.222",
"vdns_private_ip_1" : "10.0.${ecompnet}.26",
+ "onap_sec_group" : "${GLOBAL_INJECTED_SEC_GROUP}",
'scaling_vdns_name_0':'demovlbscaling${hostid}',
"vlb_private_net_cidr" : "192.168.10.0/24"
},
diff --git a/boot/robot/integration_robot_properties.py b/boot/robot/integration_robot_properties.py
index 5facd54f..68b18deb 100644
--- a/boot/robot/integration_robot_properties.py
+++ b/boot/robot/integration_robot_properties.py
@@ -59,10 +59,11 @@ GLOBAL_MSO_BPMN_SERVER_PORT = "8081"
GLOBAL_MSO_CATDB_SERVER_PORT = "8082"
GLOBAL_MSO_OPENSTACK_SERVER_PORT = "8087"
GLOBAL_MSO_REQDB_SERVER_PORT = "8083"
-GLOBAL_MSO_SDNC_SERVER_PORT = "8090"
+GLOBAL_MSO_SDNC_SERVER_PORT = "8086"
GLOBAL_MSO_VFC_SERVER_PORT = "8084"
GLOBAL_MSO_USERNAME = "InfraPortalClient"
+GLOBAL_MSO_CATDB_USERNAME = "bpel"
GLOBAL_MSO_PASSWORD = "password1$"
# music info - everything is from the private oam network (also called onap private network)
GLOBAL_MUSIC_SERVER_PROTOCOL = "http"
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index eaec4f42..76526fcb 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1245,6 +1245,7 @@ resources:
__vm_flavor__: { get_param: flavor_medium }
__public_net_id__: { get_param: public_net_id }
__oam_network_id__: { get_resource: oam_onap }
+ __sec_group__: { get_resource: onap_sg }
__script_version__: { get_param: artifacts_version }
__docker_version__: { get_param: robot_docker }
__sniro_docker_version__: { get_param: sniro_docker }
@@ -1299,6 +1300,7 @@ resources:
echo "__public_net_id__" > /opt/config/public_net_id.txt
fi
echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+ echo "__sec_group__" > /opt/config/sec_group.txt
echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot