Make teardown of dummy vf_module conditional

Try fix for chromedriver hanging

Change demo APPC command to send private oam IP

Change-Id: I86a9c1fe489dd63721b542132516bc7285baf12a
Signed-off-by: jf9860 <jf9860@att.com>

1 files changed, 42 insertions, 42 deletions

diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index a149745a..910b06b2 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -1,5 +1,5 @@
 *** Settings ***
-Documentation	  This test template encapsulates the VNF Orchestration use case. 
+Documentation	  This test template encapsulates the VNF Orchestration use case.
 
 Resource        ../vid/create_service_instance.robot
 Resource        ../vid/vid_interface.robot
@@ -25,43 +25,43 @@ Library	        Collections
 
 *** Variables ***
 
-${TENANT_NAME}    
+${TENANT_NAME}
 ${TENANT_ID}
 ${REGIONS}
 ${CUSTOMER_NAME}
 ${STACK_NAME}
-${SERVICE} 
+${SERVICE}
 ${VVG_SERVER_ID}
 ${SERVICE_INSTANCE_ID}
 
-*** Keywords ***     
- 
+*** Keywords ***
+
 Orchestrate VNF
     [Documentation]   Use openECOMP to Orchestrate a service.
     [Arguments]    ${customer_name}    ${service}    ${product_family}    ${lcp_region}    ${tenant}
-    ${uuid}=    Generate UUID  
+    ${uuid}=    Generate UUID
     Set Test Variable    ${CUSTOMER_NAME}    ${customer_name}_${uuid}
     Set Test Variable    ${SERVICE}    ${service}
-    ${vnf_name}=    Catenate    Vnf_Ete_Name${uuid}       
+    ${vnf_name}=    Catenate    Vnf_Ete_Name${uuid}
     ${service_name}=    Catenate    Service_Ete_Name${uuid}
     ${service_type}=    Set Variable    ${service}
     ${vf_module_name}=    Catenate    Vfmodule_Ete_Name${uuid}
     ${service_model_type}     ${vnf_type}    ${vf_modules} =    Model Distribution For Directory    ${service}
     ## MSO polling is 60 second intervals
-    Sleep    70s     
-    Run Keyword If   '${service}' == 'vVG'    Create VVG Server    ${uuid}  
-    Create Customer For VNF    ${CUSTOMER_NAME}    ${CUSTOMER_NAME}    INFRA    ${service_type}    ${GLOBAL_AAI_CLOUD_OWNER}    ${GLOBAL_OPENSTACK_SERVICE_REGION}        
-    Setup Browser   
+    Sleep    70s
+    Run Keyword If   '${service}' == 'vVG'    Create VVG Server    ${uuid}
+    Create Customer For VNF    ${CUSTOMER_NAME}    ${CUSTOMER_NAME}    INFRA    ${service_type}    ${GLOBAL_AAI_CLOUD_OWNER}    ${GLOBAL_OPENSTACK_SERVICE_REGION}
+    Setup Browser
     Login To VID GUI
     ${service_instance_id}=    Create VID Service Instance    ${customer_name}    ${service_model_type}    ${service}     ${service_name}
     Set Test Variable   ${SERVICE_INSTANCE_ID}   ${service_instance_id}
-    Validate Service Instance    ${service_instance_id}    ${service}      ${customer_name}     
+    Validate Service Instance    ${service_instance_id}    ${service}      ${customer_name}
     Create VID VNF    ${service_instance_id}    ${vnf_name}    ${product_family}    ${lcp_region}    ${tenant}    ${vnf_type}
     ${vf_module_type}   ${closedloop_vf_module}=   Preload Vnf    ${service_instance_id}   ${vnf_name}   ${vnf_type}   ${vf_module_name}    ${vf_modules}    ${service}    ${uuid}
     ${vf_module_id}=   Create VID VNF module    ${service_instance_id}    ${vf_module_name}    ${lcp_region}    ${tenant}     ${vf_module_type}
     ${generic_vnf}=   Validate Generic VNF    ${vnf_name}    ${vnf_type}    ${service_instance_id}
-    VLB Closed Loop Hack   ${service}   ${generic_vnf}   ${closedloop_vf_module}      
-    Set Test Variable    ${STACK_NAME}   ${vf_module_name}         
+    VLB Closed Loop Hack   ${service}   ${generic_vnf}   ${closedloop_vf_module}
+    Set Test Variable    ${STACK_NAME}   ${vf_module_name}
     Execute Heatbridge    ${vf_module_name}    ${service_instance_id}    ${service}
     Validate VF Module      ${vf_module_name}    ${service}
     [Return]     ${vf_module_name}    ${service}
@@ -70,75 +70,75 @@ Orchestrate VNF
 Create Customer For VNF
     [Documentation]    VNF Orchestration Test setup....
     ...                Create Tenant if not exists, Create Customer, Create Service and related relationships
-    [Arguments]    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}    ${cloud_owner}  ${cloud_region_id}         
-    ${resp}=    Create Customer    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}   ${cloud_owner}  ${cloud_region_id}    ${TENANT_ID}	
+    [Arguments]    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}    ${cloud_owner}  ${cloud_region_id}
+    ${resp}=    Create Customer    ${customer_name}    ${customer_id}    ${customer_type}    ${service_type}   ${cloud_owner}  ${cloud_region_id}    ${TENANT_ID}
 	Should Be Equal As Strings 	${resp} 	201
     Create Service If Not Exists    ${service_type}
 
 Setup Orchestrate VNF
-    [Documentation]    Called before each test case to ensure tenant and region data 
-    ...                required by the Orchstrate VNF exists in A&AI 
+    [Documentation]    Called before each test case to ensure tenant and region data
+    ...                required by the Orchstrate VNF exists in A&AI
     [Arguments]        ${cloud_owner}  ${cloud_region_id}   ${cloud_type}    ${owner_defined_type}    ${cloud_region_version}    ${cloud_zone}
     Initialize Tenant From Openstack
     Initialize Regions From Openstack
     :FOR    ${region}    IN    @{REGIONS}
-    \    Inventory Tenant If Not Exists    ${cloud_owner}  ${region}  ${cloud_type}    ${owner_defined_type}    ${cloud_region_version}    ${cloud_zone}    ${TENANT_NAME}    ${TENANT_ID}       
-    Log   Orchestrate VNF setup complete    
-        
+    \    Inventory Tenant If Not Exists    ${cloud_owner}  ${region}  ${cloud_type}    ${owner_defined_type}    ${cloud_region_version}    ${cloud_zone}    ${TENANT_NAME}    ${TENANT_ID}
+    Log   Orchestrate VNF setup complete
+
 Initialize Tenant From Openstack
     [Documentation]    Initialize the tenant test variables
     Run Openstack Auth Request    auth
     ${tenants}=    Get Current Openstack Tenant     auth
     ${tenant_name}=    Evaluate    $tenants.get("name")
-    ${tenant_id}=     Evaluate    $tenants.get("id")  
+    ${tenant_id}=     Evaluate    $tenants.get("id")
     Set Test Variable	${TENANT_NAME}   ${tenant_name}
-    Set Test Variable	${TENANT_ID}     ${tenant_id}   
+    Set Test Variable	${TENANT_ID}     ${tenant_id}
 
 Initialize Regions From Openstack
     [Documentation]    Initialize the regions test variable
     Run Openstack Auth Request    auth
     ${regs}=    Get Openstack Regions    auth
-    Set Test Variable	${REGIONS}     ${regs} 
+    Set Test Variable	${REGIONS}     ${regs}
 
 Create VVG Server
     [Documentation]    For the VolumeGroup test case, create a server to attach the volume group to be orchestrated.
-    [Arguments]    ${uuid}            
+    [Arguments]    ${uuid}
     Run Openstack Auth Request    auth
     ${vvg_server_name}=    Catenate   vVG_${uuid}
     ${server}=   Add Server For Image Name  auth    ${vvg_server_name}   ${GLOBAL_VVGSERVER_IMAGE}   ${GLOBAL_VVGSERVER_FLAVOR}
     ${server}=       Get From Dictionary   ${server}   server
     ${server_id}=    Get From Dictionary   ${server}   id
     Set Test Variable    ${VVG_SERVER_ID}   ${server_id}
-    ${vvg_params}=    Get VVG Preload Parameters 
+    ${vvg_params}=    Get VVG Preload Parameters
     Set To Dictionary   ${vvg_params}   nova_instance   ${server_id}
-    Wait for Server to Be Active    auth    ${server_id}    
+    Wait for Server to Be Active    auth    ${server_id}
 
 Get VVG Preload Parameters
-    [Documentation]   Get preload parameters for the VVG test case so we can include 
-    ...               the nova_instance id of the attached server    
+    [Documentation]   Get preload parameters for the VVG test case so we can include
+    ...               the nova_instance id of the attached server
     ${test_dict}=    Get From Dictionary    ${GLOBAL_PRELOAD_PARAMETERS}    Vnf-Orchestration
     ${vvg_params}   Get From Dictionary    ${test_dict}    vvg_preload.template
     [Return]    ${vvg_params}
-       
+
 Teardown VNF
     [Documentation]    Called at the end of a test case to tear down the VNF created by Orchestrate VNF
-    Teardown VVG Server  
-    Teardown VLB Closed Loop Hack
-    Run Keyword If   '${TEST STATUS}' == 'PASS'  Teardown VID   ${SERVICE_INSTANCE_ID}   ${GLOBAL_OPENSTACK_SERVICE_REGION}   ${TENANT_ID}
-    Run Keyword If   '${TEST STATUS}' == 'PASS'    Teardown Model Distribution  
-    Run Keyword If   '${TEST STATUS}' == 'PASS'    Clean A&AI Inventory 
-    Close All Browsers 
+    Teardown VVG Server
+    Run Keyword If   '${TEST STATUS}' == 'PASS'   Teardown VLB Closed Loop Hack
+    Run Keyword If   '${TEST STATUS}' == 'PASS'   Teardown VID   ${SERVICE_INSTANCE_ID}   ${GLOBAL_OPENSTACK_SERVICE_REGION}   ${TENANT_ID}
+    Run Keyword If   '${TEST STATUS}' == 'PASS'   Teardown Model Distribution
+    Run Keyword If   '${TEST STATUS}' == 'PASS'   Clean A&AI Inventory
+    Close All Browsers
     Log    Teardown VNF implemented for successful tests only
 
 Teardown VVG Server
     [Documentation]   Teardown the server created as a place to mount the Volume Group.
     Return From Keyword if   '${VVG_SERVER_ID}' == ''
     Delete Server   auth   ${VVG_SERVER_ID}
-    Wait for Server To Be Deleted    auth    ${VVG_SERVER_ID}    
-    ${vvg_params}=    Get VVG Preload Parameters   
+    Wait for Server To Be Deleted    auth    ${VVG_SERVER_ID}
+    ${vvg_params}=    Get VVG Preload Parameters
     Remove from Dictionary   ${vvg_params}   nova_instance
     Log    Teardown VVG Server Completed
-    
+
 Teardown Stack
     [Documentation]    OBSOLETE - Called at the end of a test case to tear down the Stack created by Orchestrate VNF
     [Arguments]   ${stack}
@@ -152,11 +152,11 @@ Teardown Stack
     Run Keyword If   '${key_pair_status}' == 'PASS'   Delete Openstack Keypair    auth    ${keypair_name}
     Teardown VLB Closed Loop Hack
 
-Clean A&AI Inventory 
-    [Documentation]    Clean up Tenant in A&AI, Create Customer, Create Service and related relationships	
+Clean A&AI Inventory
+    [Documentation]    Clean up Tenant in A&AI, Create Customer, Create Service and related relationships
     :FOR    ${region}    IN    @{REGIONS}
     \      Delete Tenant  ${TENANT_ID}    ${GLOBAL_AAI_CLOUD_OWNER}  ${region}
     \      Delete Cloud Region  ${TENANT_ID}    ${GLOBAL_AAI_CLOUD_OWNER}  ${region}
     Delete Customer    ${CUSTOMER_NAME}
-    Delete Service If Exists    ${SERVICE}    	
+    Delete Service If Exists    ${SERVICE}