From f1621dea58fa5beb96356550918a7637d0133034 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 20 Jun 2019 15:37:57 -0400 Subject: move rest of stirngtemplating off old format Issue-ID: TEST-158 Change-Id: I55c246eba1c0132d70b9c7298da095c72cdecbc3 Signed-off-by: DR695H --- robot/assets/templates/appc/vnf_mount.jinja | 16 +++ robot/assets/templates/appc/vnf_mount.template | 16 --- robot/assets/templates/cds/so_request.template | 48 ------- robot/assets/templates/cds/vfmodule.template | 16 --- robot/assets/templates/cds/vnf.template | 23 --- robot/assets/templates/so/cds_request.jinja | 48 +++++++ robot/assets/templates/so/cds_vfmodule.jinja | 16 +++ robot/assets/templates/so/cds_vnf.jinja | 23 +++ robot/assets/templates/web/index.html.jinja | 192 +++++++++++++++++++++++++ robot/assets/templates/web/index.html.template | 192 ------------------------- 10 files changed, 295 insertions(+), 295 deletions(-) create mode 100644 robot/assets/templates/appc/vnf_mount.jinja delete mode 100644 robot/assets/templates/appc/vnf_mount.template delete mode 100644 robot/assets/templates/cds/so_request.template delete mode 100644 robot/assets/templates/cds/vfmodule.template delete mode 100644 robot/assets/templates/cds/vnf.template create mode 100644 robot/assets/templates/so/cds_request.jinja create mode 100644 robot/assets/templates/so/cds_vfmodule.jinja create mode 100644 robot/assets/templates/so/cds_vnf.jinja create mode 100644 robot/assets/templates/web/index.html.jinja delete mode 100644 robot/assets/templates/web/index.html.template (limited to 'robot/assets') diff --git a/robot/assets/templates/appc/vnf_mount.jinja b/robot/assets/templates/appc/vnf_mount.jinja new file mode 100644 index 00000000..14f638fe --- /dev/null +++ b/robot/assets/templates/appc/vnf_mount.jinja @@ -0,0 +1,16 @@ + + {{nodeid}} + {{host}} + {{port}} + {{username}} + {{password}} + false + + false + 20000 + 0 + 2000 + 1.5 + + 120 + \ No newline at end of file diff --git a/robot/assets/templates/appc/vnf_mount.template b/robot/assets/templates/appc/vnf_mount.template deleted file mode 100644 index 8ad11359..00000000 --- a/robot/assets/templates/appc/vnf_mount.template +++ /dev/null @@ -1,16 +0,0 @@ - - ${nodeid} - ${host} - ${port} - ${username} - ${password} - false - - false - 20000 - 0 - 2000 - 1.5 - - 120 - \ No newline at end of file diff --git a/robot/assets/templates/cds/so_request.template b/robot/assets/templates/cds/so_request.template deleted file mode 100644 index bf0a8edb..00000000 --- a/robot/assets/templates/cds/so_request.template +++ /dev/null @@ -1,48 +0,0 @@ -{ - "requestDetails" : { - "subscriberInfo" : { - "globalSubscriberId" : "${subscriber_id}" - }, - "requestInfo" : { - "suppressRollback" : true, - "productFamilyId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "requestorId" : "ym9479", - "instanceName" : "${service_instance_name}", - "source" : "VID" - }, - "requestParameters" : { - "subscriptionServiceType" : "${subscription_service_type}", - "userParams" : [ - { - "service" : { - "instanceParams" : [], - "instanceName" : "${service_instance_name}", - "resources" : { - "vnfs" : ${vnfs} - }, - "modelInfo" : { - "modelType" : "service", - "modelName" : "${service_model_name}", - "modelVersionId" : "${service_model_UUID}" - } - } - } - ], - "aLaCarte" : false - }, - "project" : { - "projectName" : "some project name" - }, - "owningEntity" : { - "owningEntityName" : "PACKET CORE", - "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489" - }, - "modelInfo" : { - "modelVersion" : "10.0", - "modelVersionId" : "${service_model_UUID}", - "modelInvariantId" : "${service_model_invariantUUID}", - "modelName" : "${service_model_name}", - "modelType" : "service" - } - } -} diff --git a/robot/assets/templates/cds/vfmodule.template b/robot/assets/templates/cds/vfmodule.template deleted file mode 100644 index bde231e0..00000000 --- a/robot/assets/templates/cds/vfmodule.template +++ /dev/null @@ -1,16 +0,0 @@ -{ - "modelInfo": { - "modelType": "vfModule", - "modelName": "${vf_module_model_name}", - "modelVersionId": "${vf_module_model_version_id}", - "modelCustomizationId": "${vf_module_model_customization_id}" - }, - "instanceName": "${vf_module_name}", - "instanceParams": [ - { - "vfw_param1": "24", - "vfw_param2": "24", - "vfw_param3": "24" - } - ] -} diff --git a/robot/assets/templates/cds/vnf.template b/robot/assets/templates/cds/vnf.template deleted file mode 100644 index 954654e6..00000000 --- a/robot/assets/templates/cds/vnf.template +++ /dev/null @@ -1,23 +0,0 @@ -{ - "modelInfo": { - "modelType": "vnf", - "modelName": "${vnf_model_name}", - "modelVersionId": "${vnf_model_version_id}", - "modelCustomizationName": "${vnf_model_customization_name}", - "modelCustomizationId": "${vnf_model_customization_id}" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "${cloud_region}", - "tenantId": "${tenant_id}" - }, - "platform": { - "platformName": "test" - }, - "lineOfBusiness": { - "lineOfBusinessName": "someValue" - }, - "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "instanceName": "${vnf_name}", - "instanceParams": [], - "vfModules": [${vf_modules}] -} diff --git a/robot/assets/templates/so/cds_request.jinja b/robot/assets/templates/so/cds_request.jinja new file mode 100644 index 00000000..bd82bc74 --- /dev/null +++ b/robot/assets/templates/so/cds_request.jinja @@ -0,0 +1,48 @@ +{ + "requestDetails" : { + "subscriberInfo" : { + "globalSubscriberId" : "{{subscriber_id}}" + }, + "requestInfo" : { + "suppressRollback" : true, + "productFamilyId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId" : "ym9479", + "instanceName" : "{{service_instance_name}}", + "source" : "VID" + }, + "requestParameters" : { + "subscriptionServiceType" : "{{subscription_service_type}}", + "userParams" : [ + { + "service" : { + "instanceParams" : [], + "instanceName" : "{{service_instance_name}}", + "resources" : { + "vnfs" : {{vnfs} + }, + "modelInfo" : { + "modelType" : "service", + "modelName" : "{{service_model_name}}", + "modelVersionId" : "{{service_model_UUID}}" + } + } + } + ], + "aLaCarte" : false + }, + "project" : { + "projectName" : "some project name" + }, + "owningEntity" : { + "owningEntityName" : "PACKET CORE", + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489" + }, + "modelInfo" : { + "modelVersion" : "10.0", + "modelVersionId" : "{{service_model_UUID}}", + "modelInvariantId" : "{{service_model_invariantUUID}}", + "modelName" : "{{service_model_name}}", + "modelType" : "service" + } + } +} diff --git a/robot/assets/templates/so/cds_vfmodule.jinja b/robot/assets/templates/so/cds_vfmodule.jinja new file mode 100644 index 00000000..b4b7d7e0 --- /dev/null +++ b/robot/assets/templates/so/cds_vfmodule.jinja @@ -0,0 +1,16 @@ +{ + "modelInfo": { + "modelType": "vfModule", + "modelName": "{{vf_module_model_name}}", + "modelVersionId": "{{vf_module_model_version_id}}", + "modelCustomizationId": "{{vf_module_model_customization_id}}" + }, + "instanceName": "{{vf_module_name}}", + "instanceParams": [ + { + "vfw_param1": "24", + "vfw_param2": "24", + "vfw_param3": "24" + } + ] +} diff --git a/robot/assets/templates/so/cds_vnf.jinja b/robot/assets/templates/so/cds_vnf.jinja new file mode 100644 index 00000000..d3aa35d1 --- /dev/null +++ b/robot/assets/templates/so/cds_vnf.jinja @@ -0,0 +1,23 @@ +{ + "modelInfo": { + "modelType": "vnf", + "modelName": "{{vnf_model_name}}", + "modelVersionId": "{{vnf_model_version_id}}", + "modelCustomizationName": "{{vnf_model_customization_name}}", + "modelCustomizationId": "{{vnf_model_customization_id}}" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "{{cloud_region}}", + "tenantId": "{{tenant_id}}" + }, + "platform": { + "platformName": "test" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "{{vnf_name}}", + "instanceParams": [], + "vfModules": [{{vf_modules}}] +} diff --git a/robot/assets/templates/web/index.html.jinja b/robot/assets/templates/web/index.html.jinja new file mode 100644 index 00000000..e8cd8b51 --- /dev/null +++ b/robot/assets/templates/web/index.html.jinja @@ -0,0 +1,192 @@ + + Quicklinks To Running Instances + + + +

The Portal

+ + The portal is the entry point to design/provision/operate ONAP. From there you can get to SDC, VID and Policy portals. + + The portal can be found at:

+ + Portal +

+ One requires role based user names and passwords to receive the full portal functionality. In the demo setup we pre provisioned: +

+

+

+ the password for all of them is: demo123456! + +

/etc/hosts or C:\Windows\system32\drivers\etc\hosts +
+
+{{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
+{{message_router}} message-router
+{{bus_controller}} dmaap-bc
+{{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
+{{message_router}} {{prefix}}-message-router
+{{clamp}} {{prefix}}-clamp
+
+	
+ +

The Reality

+ + 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. + +

Testing

+ +

Robot Logs

+ + Robot Logs + +

Robot vm_properties.py for local testing

+
+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_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_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_BC_IP_ADDR = "{{bus_controller}}"
+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_MSB_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}}"
+
+    
+ +

SDN-C

+ + Controller with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

+ + To sign up

+ Admin

+ +

App-C

+ + Controller with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

+ +

Policy

+ + Not working. : + Healthcheck

+ +

MSO

+ + JBOSS GUI with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

+ + Camunda GUI with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

+ +

DCAE

+ +

General GUIs

+ DCAE Controller + This might show up empty in a web browser as no content type is set in the response. If that's the case use curl:

+ + curl http://console:ZjJkYjllMjljMTI2M2Iz@{{dcae_controller}}:9998/resources

+ + CDAP GUI

+ +

DCAE internal Message Router

+ + Topics

+ + MR topic for collector to TCA

+ + MR topic for TCA alert to Policy

+ +

Message Router used between core components

+ + List of Topics

+ +

Topics of Interest

+ + For topics without authentication one can monitor the traffic on a topic with:

+ + http://{{message_router}}:3904/events/PUT_TOPIC_HERE/group1/C1?timeout=5000

+ + some important once listed below.

+ +

+ +

SSH to VM

+ + 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.

+ + AAI1

+ Policy

+ SDC

+ Portal

+ DCAE

+ APP-C

+ MSO

+ SDN-C

+ VID

+ Message Router

+ Robot Framework for testing

+ DNS server for management network

+ + Inside the VM you can list the docker containers by typing:

+ docker ps

+ and can get a shell prompt by executing the bash command. + For example:

docker exec -it openecompete_container bash

+ + + + + diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template deleted file mode 100644 index 5e156c41..00000000 --- a/robot/assets/templates/web/index.html.template +++ /dev/null @@ -1,192 +0,0 @@ - - Quicklinks To Running Instances - - - -

The Portal

- - The portal is the entry point to design/provision/operate ONAP. From there you can get to SDC, VID and Policy portals. - - The portal can be found at:

- - Portal -

- One requires role based user names and passwords to receive the full portal functionality. In the demo setup we pre provisioned: -

-

-

- the password for all of them is: demo123456! - -

/etc/hosts or C:\Windows\system32\drivers\etc\hosts -
-
-${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
-${message_router} message-router
-${bus_controller} dmaap-bc
-${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
-${message_router} ${prefix}-message-router
-${clamp} ${prefix}-clamp
-
-	
- -

The Reality

- - 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. - -

Testing

- -

Robot Logs

- - Robot Logs - -

Robot vm_properties.py for local testing

-
-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_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_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_BC_IP_ADDR = "${bus_controller}"
-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_MSB_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}"
-
-    
- -

SDN-C

- - Controller with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

- - To sign up

- Admin

- -

App-C

- - Controller with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

- -

Policy

- - Not working. : - Healthcheck

- -

MSO

- - JBOSS GUI with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

- - Camunda GUI with admin/Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U

- -

DCAE

- -

General GUIs

- DCAE Controller - This might show up empty in a web browser as no content type is set in the response. If that's the case use curl:

- - curl http://console:ZjJkYjllMjljMTI2M2Iz@${dcae_controller}:9998/resources

- - CDAP GUI

- -

DCAE internal Message Router

- - Topics

- - MR topic for collector to TCA

- - MR topic for TCA alert to Policy

- -

Message Router used between core components

- - List of Topics

- -

Topics of Interest

- - For topics without authentication one can monitor the traffic on a topic with:

- - http://${message_router}:3904/events/PUT_TOPIC_HERE/group1/C1?timeout=5000

- - some important once listed below.

- -

- -

SSH to VM

- - 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.

- - AAI1

- Policy

- SDC

- Portal

- DCAE

- APP-C

- MSO

- SDN-C

- VID

- Message Router

- Robot Framework for testing

- DNS server for management network

- - Inside the VM you can list the docker containers by typing:

- docker ps

- and can get a shell prompt by executing the bash command. - For example:

docker exec -it openecompete_container bash

- - - - - -- cgit 1.2.3-korg