Fix up the vVG server heat template
Issue: TEST-14
Change-Id: I8304325c9c3b2abebd358f7d931d9d7490d33a5b
Signed-off-by: Jerry Flood <jf9860@att.com>
diff --git a/robot/assets/templates/nova_add_server.template b/robot/assets/templates/nova_add_server.template
index 8157839..d40774a 100644
--- a/robot/assets/templates/nova_add_server.template
+++ b/robot/assets/templates/nova_add_server.template
@@ -10,7 +10,7 @@
},
"networks": [
{
- "uuid": "00000000-0000-0000-0000-000000000000"
+ "uuid": "${public_net_id}"
}
]
}
diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template
index 3398b07..029471c 100644
--- a/robot/assets/templates/web/index.html.template
+++ b/robot/assets/templates/web/index.html.template
@@ -9,7 +9,7 @@
The portal can be found at:<p>
- <a href="http://portal.api.simpledemo.openecomp.org:8989/ONAPPORTAL/login.htm">Portal</a>
+ <a href="http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm">Portal</a>
<p>
One requires role based user names and passwords to receive the full portal functionality. In the demo setup we pre provisioned:
<p>
@@ -38,7 +38,7 @@
${appc} appc
${mso} so
${sdnc} sdnc
-${openo} multi-service
+${openo} multi-service
${dcae_controller} dcae
${aai2} aai2
${message_router} message-router
@@ -46,14 +46,14 @@
${portal} ${prefix}-portal
${sdc} ${prefix}-sdc
-${vid} ${prefix}-vid
-${policy} ${prefix}-policy
-${aai1} ${prefix}-aai1
+${vid} ${prefix}-vid
+${policy} ${prefix}-policy
+${aai1} ${prefix}-aai1
${robot} ${prefix}-robot
${appc} ${prefix}-appc
${mso} ${prefix}-so
${sdnc} ${prefix}-sdnc
-${openo} ${prefix}-multi-service
+${openo} ${prefix}-multi-service
${dcae_controller} ${prefix}-dcae
${aai2} ${prefix}-aai2
${message_router} ${prefix}-message-router
@@ -100,6 +100,10 @@
GLOBAL_INJECTED_VID_IP_ADDR = "${vid}"
GLOBAL_INJECTED_OPENO_IP_ADDR = "${openo}"
GLOBAL_INJECTED_CLAMP_IP_ADDR = "${clamp}"
+GLOBAL_INJECTED_VM_FLAVOR = "${GLOBAL_INJECTED_VM_FLAVOR}"
+GLOBAL_INJECTED_VM_IMAGE_NAME = "${GLOBAL_INJECTED_VM_IMAGE_NAME}"
+GLOBAL_INJECTED_PUBLIC_NET_ID = "${GLOBAL_INJECTED_PUBLIC_NET_ID}"
+
</pre>
<h2> SDN-C </h2>
diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot
index b36d09f..2c9ec4c 100644
--- a/robot/resources/openstack/nova_interface.robot
+++ b/robot/resources/openstack/nova_interface.robot
@@ -92,14 +92,14 @@
Add Server For Image Name
[Documentation] Adds a server for the passed if
- [Arguments] ${alias} ${name} ${imageName} ${flavorName}
+ [Arguments] ${alias} ${name} ${imageName} ${flavorName} ${public_net_id}
${images}= Get Openstack Images ${alias}
${flavors}= Get Openstack Flavors ${alias}
${images}= Get From Dictionary ${images} images
${flavors}= Get From Dictionary ${flavors} flavors
${imageRef}= Get Id For Name ${images} ${imageName}
${flavorRef}= Get Id For Name ${flavors} ${flavorName}
- ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef}
+ ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} public_net_id=${public_net_id}
${data}= Fill JSON Template File ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict}
${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} data_path= data=${data}
${status_string}= Convert To String ${resp.status_code}
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 7289fbd..1d293ec 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -113,7 +113,7 @@
[Arguments] ${uuid}
Run Openstack Auth Request auth
${vvg_server_name}= Catenate vVG_${uuid}
- ${server}= Add Server For Image Name auth ${vvg_server_name} ${GLOBAL_VVGSERVER_IMAGE} ${GLOBAL_VVGSERVER_FLAVOR}
+ ${server}= Add Server For Image Name auth ${vvg_server_name} ${GLOBAL_INJECTED_VM_IMAGE_NAME} ${GLOBAL_INJECTED_VM_FLAVOR} ${GLOBAL_INJECTED_PUBLIC_NET_ID}
${server}= Get From Dictionary ${server} server
${server_id}= Get From Dictionary ${server} id
Set Test Variable ${VVG_SERVER_ID} ${server_id}