diff options
Diffstat (limited to 'robot/assets')
| -rw-r--r-- | robot/assets/service_mappings.py | 2 | ||||
| -rw-r--r-- | robot/assets/templates/aai/add_demo_customer.template | 38 | ||||
| -rw-r--r-- | robot/assets/templates/asdc/feature_group.template | 5 | ||||
| -rw-r--r-- | robot/assets/templates/web/index.html.template | 4 |
4 files changed, 42 insertions, 7 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index 2cdc0d59..ff41fad3 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -33,6 +33,8 @@ GLOBAL_SERVICE_TEMPLATE_MAPPING = { "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "name_pattern": "base_clearwater"}], "vFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}], "vPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], + "vFWCL" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}, + {"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], } ''' diff --git a/robot/assets/templates/aai/add_demo_customer.template b/robot/assets/templates/aai/add_demo_customer.template index a52d65bd..a91e3836 100644 --- a/robot/assets/templates/aai/add_demo_customer.template +++ b/robot/assets/templates/aai/add_demo_customer.template @@ -79,6 +79,44 @@ } ] } + }, { + "service-type" : "${service5}", + "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" : "${service6}", + "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/asdc/feature_group.template b/robot/assets/templates/asdc/feature_group.template index 8404bafc..9b54663a 100644 --- a/robot/assets/templates/asdc/feature_group.template +++ b/robot/assets/templates/asdc/feature_group.template @@ -7,6 +7,5 @@ ], "addedEntitlementPoolsIds": [ "${entitlement_pool_id}" - ], - "manufacturerReferenceNumber" : "${manufacturer_reference_number}" -}
\ No newline at end of file + ] +} diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template index cf75f28e..5bfa4f15 100644 --- a/robot/assets/templates/web/index.html.template +++ b/robot/assets/templates/web/index.html.template @@ -40,7 +40,6 @@ ${mso} so ${sdnc} sdnc ${openo} multi-service ${dcae_controller} dcae -${aai2} aai2 ${message_router} message-router ${clamp} clamp @@ -55,7 +54,6 @@ ${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 @@ -87,7 +85,6 @@ 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}" @@ -170,7 +167,6 @@ GLOBAL_INJECTED_PUBLIC_NET_ID = "${GLOBAL_INJECTED_PUBLIC_NET_ID}" 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://${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> |