aboutsummaryrefslogtreecommitdiffstats
path: root/robot/assets/templates
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-10-19 13:43:43 -0400
committerJerry Flood <jf9860@att.com>2017-10-19 13:44:03 -0400
commitc8bd42748ea4844cdba35dda7dec2d156f3acc8d (patch)
tree40963fb8c7761376c7d4f1718b720789473c87c5 /robot/assets/templates
parent3a9cc248ea9fc77e805e6afc241f2bb16b9a887b (diff)
Update HEAT templates and add data to robot page
Issue: TEST-66 Change-Id: I9f8ce858d0e78791e84ca93be3576de0e3d8e850 Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot/assets/templates')
-rw-r--r--robot/assets/templates/sdnc/preload.template62
-rw-r--r--robot/assets/templates/web/index.html.template46
2 files changed, 74 insertions, 34 deletions
diff --git a/robot/assets/templates/sdnc/preload.template b/robot/assets/templates/sdnc/preload.template
index b2f4f088..327d806c 100644
--- a/robot/assets/templates/sdnc/preload.template
+++ b/robot/assets/templates/sdnc/preload.template
@@ -1,31 +1,33 @@
{
- "input": {
- "vnf-topology-information": {
- "vnf-topology-identifier": {
- "service-type": "${service_type}",
- "vnf-name": "${vf_module_name}",
- "vnf-type": "${vf_module_type}",
- "generic-vnf-name": "${generic_vnf_name}",
- "generic-vnf-type": "${generic_vnf_type}"
- },
- "vnf-assignments": {
- "availability-zones": [],
- "vnf-networks": [],
- "vnf-vms": []
- },
- "vnf-parameters": ${vnf_parameters}
- },
- "request-information": {
- "request-id": "robot12",
- "order-version": "1",
- "notification-url": "openecomp.org",
- "order-number": "1",
- "request-action": "PreloadVNFRequest"
- },
- "sdnc-request-header": {
- "svc-request-id": "robot12",
- "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
- "svc-action": "reserve"
- }
- }
-} \ No newline at end of file
+ "input": {
+ "request-information": {
+ "notification-url": "openecomp.org",
+ "order-number": "1",
+ "order-version": "1",
+ "request-action": "PreloadVNFRequest",
+ "request-id": "robot12"
+ },
+ "sdnc-request-header": {
+ "svc-action": "reserve",
+ "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify",
+ "svc-request-id": "robot12"
+ },
+ "vnf-topology-information": {
+ "vnf-assignments": {
+ "availability-zones": [],
+ "vnf-networks": [],
+ "vnf-vms": []
+ },
+ "vnf-parameters":
+ ${vnf_parameters}
+ ,
+ "vnf-topology-identifier": {
+ "generic-vnf-name": "${generic_vnf_name}",
+ "generic-vnf-type": "${generic_vnf_type}",
+ "vnf-name": "${vf_module_name}",
+ "vnf-type": "${vf_module_type}",
+ "service-type": "${service_type}"
+ }
+ }
+ }
+}
diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template
index 4853fc72..db9c5ea0 100644
--- a/robot/assets/templates/web/index.html.template
+++ b/robot/assets/templates/web/index.html.template
@@ -25,15 +25,52 @@
<p>
the password for all of them is: demo123456!
+ <h3>/etc/hosts or C:\Windows\system32\drivers\etc\hosts</h>
+ <pre>
+${sdc} sdc.api.simpledemo.openecomp.org
+${policy} policy.api.simpledemo.openecomp.org
+${portal} portal.api.simpledemo.openecomp.org
+${vid} vid.api.simpledemo.openecomp.org
+ </pre>
+
<h1> The Reality </h1>
As everything should go through the portal there are many subsystems which have there own GUI or API which come in very handy when debugging things. Here the most important once.
<h2> Testing </h2>
- <b> Not working. </b> :
-
- <a href="http://${robot}:88/report.html"> Test Report </a>
+ <h3>Robot Logs</h3>
+
+ <a href="http://${robot}:88/logs/"> Robot Logs </a>
+
+ <h3>Robot vm_properties.py for local testing</h3>
+ <pre>
+GLOBAL_INJECTED_ARTIFACTS_VERSION = "${GLOBAL_INJECTED_ARTIFACTS_VERSION}"
+GLOBAL_INJECTED_GITLAB_PASSWORD = "password"
+GLOBAL_INJECTED_GITLAB_USERNAME = "username"
+GLOBAL_INJECTED_NETWORK = "${GLOBAL_INJECTED_NETWORK}"
+GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "${GLOBAL_INJECTED_NEXUS_DOCKER_REPO}"
+GLOBAL_INJECTED_NEXUS_PASSWORD = "password"
+GLOBAL_INJECTED_NEXUS_REPO = "${GLOBAL_INJECTED_NEXUS_REPO}"
+GLOBAL_INJECTED_NEXUS_USERNAME = "docker"
+GLOBAL_INJECTED_OPENSTACK_API_KEY = "openstackapikey"
+GLOBAL_INJECTED_OPENSTACK_PASSWORD = "openstackpass"
+GLOBAL_INJECTED_OPENSTACK_USERNAME = "openstackuser"
+GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}"
+GLOBAL_INJECTED_REGION = "${GLOBAL_INJECTED_REGION}"
+GLOBAL_INJECTED_KEYSTONE = "${GLOBAL_INJECTED_KEYSTONE}"
+GLOBAL_INJECTED_AAI1_IP_ADDR = "${aai1}"
+GLOBAL_INJECTED_AAI2_IP_ADDR = "${aai2}"
+GLOBAL_INJECTED_APPC_IP_ADDR = "${appc}"
+GLOBAL_INJECTED_DCAE_IP_ADDR = "${dcae_controller}"
+GLOBAL_INJECTED_SO_IP_ADDR = "${mso}"
+GLOBAL_INJECTED_MR_IP_ADDR = "${message_router}"
+GLOBAL_INJECTED_POLICY_IP_ADDR = "${policy}"
+GLOBAL_INJECTED_PORTAL_IP_ADDR = "${portal}"
+GLOBAL_INJECTED_SDC_IP_ADDR = "${sdc}"
+GLOBAL_INJECTED_SDNC_IP_ADDR = "${sdnc}"
+GLOBAL_INJECTED_VID_IP_ADDR = "${vid}"
+ </pre>
<h2> SDN-C </h2>
@@ -99,7 +136,8 @@
The following links will open a shell and ssh to the various running VMs (at least on a Mac). It assumes that the .ssh/config file has been set appropriately and /etc/hosts has been updated to the running instance.<p>
- <a href="ssh://${aai}"> AAI </a><p>
+ <a href="ssh://${aai1}"> AAI1 </a><p>
+ <a href="ssh://${aai2}"> AAI2 </a><p>
<a href="ssh://${policy}"> Policy </a><p>
<a href="ssh://${sdc}"> SDC </a><p>
<a href="ssh://${portal}"> Portal </a><p>