Support demo repo heat templates

Update the robot home page

Remove trailing stapces

Issue: TEST-14
Change-Id: Ie9ea644cb8ed03c8ae3286eaecce9beb322525dc
Signed-off-by: Jerry Flood <jf9860@att.com>

5 files changed, 44 insertions, 12 deletions

diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py
index badc5e57..e0913ff8 100644
--- a/robot/assets/service_mappings.py
+++ b/robot/assets/service_mappings.py
@@ -1,10 +1,10 @@
 '''
 This metadata identifies the folders to be zipped and uploaded to SDC for model distribution for a given VNF
 '''
-GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['base_vfw'], \
-                                 "vLB" : ['base_vlb'], \
-                                 "vVG" : ['base_vvg'], \
-                                 "vCPE" : ['base_vcpe_infra', 'base_vcpe_vbng', 'base_vcpe_vbrgemu', 'base_vcpe_vgmux', 'base_vcpe_vgw'], 
+GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['vFW'], \
+                                 "vLB" : ['vLB'], \
+                                 "vVG" : ['vVG'], \
+                                 "vCPE" : ['vCPE/infra', 'vCPE/vbng', 'vCPE/vbrgemu', 'vCPE/vgmux', 'vCPE/vgw'], 
                                  }
 
 '''
diff --git a/robot/assets/templates/web/index.html.template b/robot/assets/templates/web/index.html.template
index cb7ea2e5..3398b075 100644
--- a/robot/assets/templates/web/index.html.template
+++ b/robot/assets/templates/web/index.html.template
@@ -27,10 +27,38 @@
 
     <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
+
+${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>
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 75e2dd1e..90bf952a 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -68,8 +68,9 @@ Distribute Model From ASDC
 	Distribute ASDC Catalog Service    ${catalog_service_id}
 	${catalog_service_resp}=    Get ASDC Catalog Service    ${catalog_service_id}
 	${vf_module}=    Find Element In Array    ${loop_catalog_resource_resp['groups']}    type    org.openecomp.groups.VfModule
-    [Return]    ${catalog_service_resp['name']}    ${loop_catalog_resource_resp['name']}    ${vf_module}   ${catalog_resource_ids}    ${catalog_service_id}
 	Check Catalog Service Distributed    ${catalog_service_resp['uuid']}
+    [Return]    ${catalog_service_resp['name']}    ${loop_catalog_resource_resp['name']}    ${vf_module}   ${catalog_resource_ids}    ${catalog_service_id}
+    
 Setup ASDC Catalog Resource
     [Documentation]    Creates all the steps a vf needs for an asdc catalog resource and returns the id
     [Arguments]    ${model_zip_path}
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index c27b3014..4dce50a7 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -3,6 +3,7 @@ Documentation     The main interface for interacting with ASDC. It handles low l
 Library           OperatingSystem
 Library            ArchiveLibrary
 Library           Collections
+Library           String 
 Resource          ../asdc_interface.robot
 
 Variables       ../../assets/service_mappings.py
@@ -10,7 +11,7 @@ Variables       ../../assets/service_mappings.py
 *** Variables ***
 ${ASDC_BASE_PATH}    /sdc1
 ${ASDC_DESIGNER_PATH}    /proxy-designer1#/dashboard
-${ASDC_ASSETS_DIRECTORY}    robot/assets/asdc
+${ASDC_ASSETS_DIRECTORY}    ${GLOBAL_HEAT_TEMPLATES_FOLDER}
 ${ASDC_ZIP_DIRECTORY}    ${ASDC_ASSETS_DIRECTORY}/temp
 
 #***************** Test Case Variables *********************
@@ -24,7 +25,8 @@ Model Distribution For Directory
     ${directory_list}=    Get From Dictionary    ${GLOBAL_SERVICE_FOLDER_MAPPING}    ${service}
     ${ziplist}=    Create List
     :for   ${directory}    in    @{directory_list}
-    \    ${zip}=    Catenate    ${ASDC_ZIP_DIRECTORY}/${directory}.zip
+    \    ${zipname}=   Replace String    ${directory}    /    _     
+    \    ${zip}=    Catenate    ${ASDC_ZIP_DIRECTORY}/${zipname}.zip
     \    ${folder}=    Catenate    ${ASDC_ASSETS_DIRECTORY}/${directory}
     \    OperatingSystem.Create Directory    ${ASDC_ASSETS_DIRECTORY}/temp
     \    Create Zip From Files In Directory        ${folder}    ${zip}
diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot
index 1087a3fc..d4b409f8 100644
--- a/robot/testsuites/update_onap_page.robot
+++ b/robot/testsuites/update_onap_page.robot
@@ -13,7 +13,7 @@ Test Timeout    5 minutes
 *** Variables ***
 ${URLS_HTML_TEMPLATE}   robot/assets/templates/web/index.html.template
 
-
+${HOSTS_PREFIX}   vm
 ${WEB_USER}       test
 ${WEB_PASSWORD}
 
@@ -60,6 +60,7 @@ Update ONAP Page
     Set To Dictionary    ${values}   GLOBAL_INJECTED_OPENSTACK_TENANT_ID=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}
     Set To Dictionary    ${values}   GLOBAL_INJECTED_REGION=${GLOBAL_INJECTED_REGION}
     Set To Dictionary    ${values}   GLOBAL_INJECTED_KEYSTONE=${GLOBAL_INJECTED_KEYSTONE}
+    Set To Dictionary    ${values}   prefix=${HOSTS_PREFIX}
     Create File From Template   ${URLS_HTML_TEMPLATE}   ${URLS_HTML}   ${values}
 
 *** Keywords ***