diff options
Diffstat (limited to 'robot/assets/templates')
| -rw-r--r-- | robot/assets/templates/aai/add_complex_body.template | 42 | ||||
| -rw-r--r-- | robot/assets/templates/aai/add_demo_customer.template | 38 | ||||
| -rw-r--r-- | robot/assets/templates/aai/add_zone_body.template | 7 | ||||
| -rw-r--r-- | robot/assets/templates/nova_add_server.template | 2 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/preload.template | 62 | ||||
| -rw-r--r-- | robot/assets/templates/web/index.html.template | 82 |
6 files changed, 197 insertions, 36 deletions
diff --git a/robot/assets/templates/aai/add_complex_body.template b/robot/assets/templates/aai/add_complex_body.template new file mode 100644 index 00000000..136a620b --- /dev/null +++ b/robot/assets/templates/aai/add_complex_body.template @@ -0,0 +1,42 @@ + { + "complex-name": "${complex_name}", + "physical-location-id": "${physical_location_id}", + "data-center-code": "example-data-center-code-val-5556", + "identity-url": "example-identity-url-val-56898", + "physical-location-type": "example-physical-location-type-val-7608", + "street1": "example-street1-val-34205", + "street2": "example-street2-val-99210", + "city": "example-city-val-27150", + "state": "example-state-val-59487", + "postal-code": "example-postal-code-val-68871", + "country": "example-country-val-94173", + "region": "example-region-val-13893", + "latitude": "example-latitude-val-89101", + "longitude": "example-longitude-val-66229", + "elevation": "example-elevation-val-30253", + "lata": "example-lata-val-46073", + "relationship-list": { + "relationship": [ + { + "related-to": "cloud-region", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "${cloud_owner}" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "${region}" + } + ], + "related-to-property": [ + { + "property-key": "cloud-region.owner-defined-type", + "property-value": "${owner_defined_type}" + } + ] + } + ] + } + } diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template index e56577c5..a52d65bd 100644 --- a/robot/assets/templates/aai/add_demo_customer.template +++ b/robot/assets/templates/aai/add_demo_customer.template @@ -41,6 +41,44 @@ } ] } + }, { + "service-type" : "${service3}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "${cloud_owner}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "${cloud_region_id}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "${tenant_id}" + } + ] + } + ] + } + }, { + "service-type" : "${service4}", + "relationship-list" : { + "relationship" : [{ + "related-to" : "tenant", + "relationship-data" : [{ + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "${cloud_owner}" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "${cloud_region_id}" + }, { + "relationship-key" : "tenant.tenant-id", + "relationship-value" : "${tenant_id}" + } + ] + } + ] + } } ] } diff --git a/robot/assets/templates/aai/add_zone_body.template b/robot/assets/templates/aai/add_zone_body.template new file mode 100644 index 00000000..01f99c0a --- /dev/null +++ b/robot/assets/templates/aai/add_zone_body.template @@ -0,0 +1,7 @@ +{ +"zone-id":"${zone_id}", +"zone-name":"${zone_name}", +"design-type":"${design_type}", +"zone-context":"${zone_context}", +"status":"deployed" +}
\ No newline at end of file diff --git a/robot/assets/templates/nova_add_server.template b/robot/assets/templates/nova_add_server.template index 81578393..d40774a2 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/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..029471c8 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/ECOMPPORTAL/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> @@ -25,15 +25,86 @@ <p> the password for all of them is: demo123456! + <h3>/etc/hosts or C:\Windows\system32\drivers\etc\hosts</h> + <pre> + +${portal} portal portal.api.simpledemo.onap.org +${sdc} sdc sdc.api.simpledemo.onap.org +${vid} vid vid.api.simpledemo.onap.org +${policy} policy policy.api.simpledemo.onap.org +${aai1} aai1 aai.api.simpledemo.onap.org + +${robot} robot +${appc} appc +${mso} so +${sdnc} sdnc +${openo} multi-service +${dcae_controller} dcae +${aai2} aai2 +${message_router} message-router +${clamp} clamp + +${portal} ${prefix}-portal +${sdc} ${prefix}-sdc +${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 +${dcae_controller} ${prefix}-dcae +${aai2} ${prefix}-aai2 +${message_router} ${prefix}-message-router +${clamp} ${prefix}-clamp + + </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}" +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> @@ -99,7 +170,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> |