Updates for stability testing

Issue-ID: INT-1598
Change-Id: Ic8bd8accd6add98a3f299e9e7db5fd7c6303d36f
Signed-off-by: Brian Freeman <bf1936@att.com>

5 files changed, 24 insertions, 13 deletions

diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot
index 46a4fa01..3382f648 100644
--- a/robot/resources/sdc_interface.robot
+++ b/robot/resources/sdc_interface.robot
@@ -245,7 +245,7 @@ Create Allotted Resource Data File
 
 Download CSAR
    [Documentation]   Download CSAR
-   [Arguments]    ${catalog_service_id}    ${save_directory}=/share/csar
+   [Arguments]    ${catalog_service_id}    ${save_directory}=/share/logs/csars
    Return From Keyword If     '${catalog_service_id}'=='None'
    # get meta data
    ${resp}=    SDC.Run Get Request    ${SDC_BE_ENDPOINT}    ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}/filteredDataByParams?include=toscaArtifacts    ${SDC_DESIGNER_USER_ID}        auth=${GLOBAL_SDC_AUTHENTICATION}
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 15ec02ea..ac5c9cd1 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -90,7 +90,8 @@ Orchestrate Demo VNF
     ...                      '${service}'=='vFW'       demoVFW
     ...                      '${service}'=='vLB'       demoVLB
     ${lcp_region}=   Get Openstack Region
-    ${uuid}=    Generate UUID4
+    ${full_uuid}=    Generate UUID4
+    ${uuid}=     Evaluate    str("${full_uuid}")[:8]
     ${full_customer_name}=    Catenate    ${customer_name}_${uuid}
     ${list}=    Create List
     ${vf_module_name_list}=    Create List
@@ -100,7 +101,8 @@ Orchestrate Demo VNF
     ${server_id}=     Run Keyword If   '${service}' == 'vVG'    Create VVG Server    ${uuid}
     Create Customer For VNF    ${full_customer_name}    ${full_customer_name}    INFRA    ${service_type}    ${GLOBAL_AAI_CLOUD_OWNER}    ${tenant_id}
     Setup Browser
-    Login To VID GUI
+    Run Keyword If   "${API_TYPE}"=="GRA_API"    Login To VID GUI    gr_api
+    ...   ELSE   Login To VID GUI
     ${service_instance_id}=   Wait Until Keyword Succeeds    300s   5s    Create VID Service Instance    ${full_customer_name}    ${service_model_type}    ${service}     ${service_name}   ${project_name}   ${owning_entity}
     Wait Until Keyword Succeeds    120s    15s    Validate Service Instance    ${service_instance_id}    ${service}      ${full_customer_name}
     ServiceMapping.Set Directory    default    ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
@@ -154,6 +156,8 @@ Get Catalog Resource
     \    ${cr}=   Get From Dictionary    ${resources}    ${key}
     \    Return From Keyword If   '${base_name}' in '${cr['allArtifacts']['heat1']['artifactDisplayName']}'    ${cr}
     \    Run Keyword If    'heat2' in ${cr['allArtifacts']}    Return From Keyword If   '${base_name}' in '${cr['allArtifacts']['heat2']['artifactDisplayName']}'    ${cr}
+    \    Run Keyword If    'heat3' in ${cr['allArtifacts']}    Return From Keyword If   '${base_name}' in '${cr['allArtifacts']['heat3']['artifactDisplayName']}'    ${cr}
+    \    Run Keyword If    'heat4' in ${cr['allArtifacts']}    Return From Keyword If   '${base_name}' in '${cr['allArtifacts']['heat4']['artifactDisplayName']}'    ${cr}
     Fail    Unable to find catalog resource for ${vnf} ${base_name}
 
 Get Name Pattern
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index d981accc..11669a34 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -72,6 +72,11 @@ Instantiate Demo VFWCL
     [Tags]   instantiateDemoVFWCL
     Instantiate Demo VNF   vFWCL   base_vpkg
 
+Instantiate Demo VFWCL GRA
+    [Tags]   instantiateDemoVFWCLGRA
+    Set Global Variable    ${API_TYPE}   GRA_API
+    Instantiate Demo VNF   vFWCL   base_vpkg
+
 Instantiate VFWCL
     [Tags]   instantiateVFWCL
     Instantiate VNF   vFWCL  base_vpkg
diff --git a/robot/testsuites/vnf-orchestration-gra.robot b/robot/testsuites/vnf-orchestration-gra.robot
index 98e02f3d..6aa325e3 100644
--- a/robot/testsuites/vnf-orchestration-gra.robot
+++ b/robot/testsuites/vnf-orchestration-gra.robot
@@ -12,9 +12,12 @@ ${API_TYPE}   GRA_API
 *** Test Cases ***              CUSTOMER           SERVICE   PRODUCT_FAMILY
 
 Instantiate Virtual DNS GRA             ETE_Customer    vLB      vLB
-    [Tags]    instantiateGRA
+    [Tags]    instantiateGRA    instantiate  stability72hr   stability72hrvLB
 Instantiate Virtual Volume Group GRA    ETE_Customer    vVG      vVG
-    [Tags]    instantiateGRA
+    [Tags]    instantiateGRA    instantiate  stability72hr   stability72hrvVG
 Instantiate Virtual FirewallCL GRA      ETE_Customer    vFWCL      vFWCL
-    [Tags]    instantiateGRA
-
+    [Tags]    instantiateGRA    instantiate  stability72hr   stability72hrvFWCL
+Instantiate Virtual DNS GRA No Delete             ETE_Customer    vLB      vLB          KEEP
+    [Tags]    instantiateNoDelete   instantiateNoDeleteVLB
+Instantiate Virtual FirewallCL GRA No Delete      ETE_Customer    vFWCL      vFWCL         KEEP
+    [Tags]    instantiateNoDelete    instantiateNoDeleteVFWCL
diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot
index a6a57dfb..1efe02e4 100644
--- a/robot/testsuites/vnf-orchestration.robot
+++ b/robot/testsuites/vnf-orchestration.robot
@@ -12,13 +12,12 @@ ${API_TYPE}   VNF_API
 
 *** Test Cases ***              CUSTOMER           SERVICE   PRODUCT_FAMILY
 Instantiate Virtual DNS             ETE_Customer    vLB      vLB
-    [Tags]    instantiate  stability72hr   stability72hrvLB
+    [Tags]    instantiateVNFAPI
 Instantiate Virtual Volume Group    ETE_Customer    vVG      vVG
-    [Tags]    instantiate  stability72hr   stability72hrvVG
+    [Tags]    instantiateVNFAPI
 Instantiate Virtual FirewallCL      ETE_Customer    vFWCL      vFWCL
-    [Tags]    instantiate  stability72hr   stability72hrvFWCL
+    [Tags]    instantiateVNFAPI
 Instantiate Virtual DNS No Delete             ETE_Customer    vLB      vLB          KEEP
-    [Tags]    instantiateNoDelete
+    [Tags]    instantiateNoDeleteVNFAPI
 Instantiate Virtual FirewallCL No Delete      ETE_Customer    vFWCL      vFWCL         KEEP
-    [Tags]    instantiateNoDelete
-Instantiate Virtual Firewall        ETE_Customer    vFW      vFW
+    [Tags]    instantiateNoDeleteVNFAPI