property cleanup and pnf cleanup

Issue-ID: TEST-184
Change-Id: I355c3de561dfb80334e881c884467116ad5ee25e
Signed-off-by: DR695H <dr695h@att.com>

5 files changed, 7 insertions, 13 deletions

diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index 7c40e496..7dc5adbd 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -66,14 +66,14 @@ TOSCA Based PNF Model Distribution For Directory
     ${service_name}=    Catenate    ${service}    ${uuid}
     ${shortened_uuid}=     Evaluate    str("${service_name}")[:23]
     ${catalog_service_name}=   Set Variable If   '${catalog_service_name}' ==''   ${shortened_uuid}   ${catalog_service_name}
-    :for   ${directory}    IN    @{directory_list}
+    :FOR   ${directory}    IN    @{directory_list}
     \    ${zipname}=   Replace String    ${directory}    /    _
     \    ${csar}=    Catenate    ${SDC_CSAR_DIRECTORY}/${zipname}.csar
     \    ${folder}=    Catenate    ${SDC_TOSCA_ONBOARDING_PACKAGES_DIRECTORY}/${directory}
     \    OperatingSystem.Create Directory    ${SDC_TOSCA_ONBOARDING_PACKAGES_DIRECTORY}/temp
     \    Create Zip From Files In Directory        ${folder}    ${csar}    sub_directories=${true}
     \    Append To List    ${csarlist}    ${csar}
-    ${catalog_service_name}    ${catalog_resource_name}    ${catalog_resource_ids}   ${catalog_service_id}   ${catalog_resources}   Distribute TOSCA Model From SDC    ${csarlist}    ${catalog_service_name}   ${service}
+    ${catalog_service_name}    ${catalog_resource_name}    ${catalog_resource_ids}   ${catalog_service_id}   ${catalog_resources}   Distribute Model From SDC    ${csarlist}    ${catalog_service_name}   ${service}    resourceType=PNF
     Download CSAR    ${catalog_service_id}
     [Return]    ${catalog_service_name}    ${catalog_resource_name}    ${catalog_resources}
 
diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot
index 0e7d9025..9d252bcf 100644
--- a/robot/resources/test_templates/pnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot
@@ -6,6 +6,8 @@ Resource        ../vid/vid_interface.robot
 Resource        ../aai/service_instance.robot
 Resource        model_test_template.robot
 Resource        ../openstack/neutron_interface.robot
+Resource          ../sdc_interface.robot
+Resource          vnf_orchestration_test_template.robot
 
 
 Library         ONAPLibrary.Openstack
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index 6da031f5..34f6b5c6 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -15,6 +15,7 @@ Library         ONAPLibrary.Utilities
 Library         ONAPLibrary.Templating    WITH NAME    Templating
 Library         ONAPLibrary.AAI    WITH NAME     AAI
 Library         ONAPLibrary.SDC    WITH NAME     SDC
+Library         ONAPLibrary.SO    WITH NAME     SO
 
 *** Variables ***
 ${aai_so_registration_entry_template}=  aai/add_pnf_registration_info.jinja
@@ -22,8 +23,6 @@ ${pnf_ves_integration_request}=  ves/pnf_registration_request.jinja
 ${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_VES_PNFREG_OUTPUT_PATH}  /events/unauthenticated.VES_PNFREG_OUTPUT/2/1
 ${VES_ENDPOINT}     ${GLOBAL_DCAE_VES_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_SERVER_PORT}
 ${VES_data_path}   /eventListener/v7
-${SDC_CATALOG_SERVICES_PATH}    /sdc2/rest/v1/catalog/services
-${SDC_DESIGNER_USER_ID}    cs0008
 
 
 *** Keywords ***
@@ -63,12 +62,6 @@ Verify PNF integration request in A&AI
     Wait Until Keyword Succeeds  10x  5s  Query PNF A&AI updated entry  ${PNF_entry_dict}
     Log  PNF integration request in A&AI has been verified and contains all necessary entries
 
-Verify PNF integration request in MR
-    [Documentation]   Verify if PNF integration request entries are present in MR unauthenticated.PNF_READY/ topic
-    [Arguments]  ${PNF_entry_dict}
-    Wait Until Keyword Succeeds  10x  1s  Query PNF MR entry  ${PNF_entry_dict}
-    Log  PNF integration request in MR has been verified and contains all necessary entries
-
 Query PNF A&AI updated entry
     [Documentation]   Query PNF A&AI updated entry
     [Arguments]  ${PNF_entry_dict}
@@ -83,7 +76,6 @@ Query PNF A&AI updated entry
 
 Check VES_PNFREG_OUTPUT topic presence in MR
     [Documentation]   Verify if unauthenticated.VES_PNFREG_OUTPUT topic is present in MR
-    [Arguments]
     ${get_resp}=  Run MR Get Request  ${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_VES_PNFREG_OUTPUT_PATH}
     Should Be Equal As Strings  ${get_resp.status_code}        200
     Log  unauthenticated.VES_PNFREG_OUTPUT topic is present in MR
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 016fed20..ef9593c2 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -6,7 +6,7 @@ Resource        ../vid/vid_interface.robot
 Resource        ../aai/service_instance.robot
 Resource        ../vid/create_vid_vnf.robot
 Resource        ../vid/teardown_vid.robot
-Resource        ../sdngc_interface.robot
+Resource        ../sdnc_interface.robot
 Resource        model_test_template.robot
 
 Resource        ../aai/create_zone.robot
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index 50f1bcfb..b8b753ee 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -6,7 +6,7 @@ Resource        ../vid/vid_interface.robot
 Resource        ../aai/service_instance.robot
 Resource        ../vid/create_vid_vnf.robot
 Resource        ../vid/teardown_vid.robot
-Resource        ../sdngc_interface.robot
+Resource        ../sdnc_interface.robot
 Resource        model_test_template.robot
 
 Resource        ../aai/create_zone.robot