upgrade to python3 libraries

basing the code off of robot framework 3.1.1 instead of 3.0, replacing
selenium2lib with selnium lib and selenium3, replacing extendedselenium
with angularjs lib. Fixing most warnings and all errors from these moves

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

5 files changed, 19 insertions, 18 deletions

diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot
index 981e1c9d..47083c3b 100644
--- a/robot/resources/test_templates/model_test_template.robot
+++ b/robot/resources/test_templates/model_test_template.robot
@@ -29,7 +29,7 @@ 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}    /    _
     \    ${zip}=    Catenate    ${ASDC_ZIP_DIRECTORY}/${zipname}.zip
     \    ${folder}=    Catenate    ${ASDC_ASSETS_DIRECTORY}/${directory}
@@ -55,7 +55,7 @@ Teardown Models
     [Documentation]    Clean up at the end of the test
     [Arguments]     ${catalog_service_id}    ${catalog_resource_ids}
     Return From Keyword If    '${catalog_service_id}' == ''
-    :for    ${catalog_resource_id}   in   @{catalog_resource_ids}
+    :FOR    ${catalog_resource_id}   IN   @{catalog_resource_ids}
     \   ${resourece_json}=   Mark ASDC Catalog Resource Inactive    ${catalog_resource_id}
     ${service_json}=   Mark ASDC Catalog Service Inactive    ${catalog_service_id}
     ${services_json}=   Delete Inactive ASDC Catalog Services
diff --git a/robot/resources/test_templates/model_test_template_vcperescust.robot b/robot/resources/test_templates/model_test_template_vcperescust.robot
index 127decbe..17e3965d 100644
--- a/robot/resources/test_templates/model_test_template_vcperescust.robot
+++ b/robot/resources/test_templates/model_test_template_vcperescust.robot
@@ -29,7 +29,7 @@ Model Distribution For vCPEResCust 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}    /    _
     \    ${zip}=    Catenate    ${ASDC_ZIP_DIRECTORY}/${zipname}.zip
     \    ${folder}=    Catenate    ${ASDC_ASSETS_DIRECTORY}/${directory}
@@ -56,7 +56,7 @@ Teardown Models
     [Documentation]    Clean up at the end of the test
     [Arguments]     ${catalog_service_id}    ${catalog_resource_ids}
     Return From Keyword If    '${catalog_service_id}' == ''
-    :for    ${catalog_resource_id}   in   @{catalog_resource_ids}
+    :FOR    ${catalog_resource_id}   IN   @{catalog_resource_ids}
     \   ${resourece_json}=   Mark ASDC Catalog Resource Inactive    ${catalog_resource_id}
     ${service_json}=   Mark ASDC Catalog Service Inactive    ${catalog_service_id}
     ${services_json}=   Delete Inactive ASDC Catalog Services
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 fdd9dc4f..09655b51 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -5,6 +5,7 @@ Resource        ../mr_interface.robot
 Resource        ../json_templater.robot
 Library         OpenstackLibrary
 Library         OperatingSystem
+Library         RequestsLibrary
 Library         UUID
 Library         Collections
 Library         JSONUtils
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index b3a4bdda..ec22265b 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -19,7 +19,7 @@ Resource        ../heatbridge.robot
 
 
 Library         OpenstackLibrary
-Library 	    ExtendedSelenium2Library
+Library 	    SeleniumLibrary
 Library	        UUID
 Library	        Collections
 Library         JSONUtils
@@ -71,7 +71,7 @@ Orchestrate VNF
     ${vnf_name_index}=   Set Variable  0
     ${vf_module_name_list}=    Create List
     ${uuid}=    Evaluate    str("${uuid}")[:8]
-    :for   ${vnf}   in   @{vnflist}
+    :FOR   ${vnf}   IN   @{vnflist}
     # APPC max is 50 characters
     \   ${vnf_name}=    Catenate    Ete_${vnf}_${uuid}_${vnf_name_index}
     \   ${vf_module_name}=    Catenate    Vfmodule_Ete_${vnf}_${uuid}_${vnf_name_index}
@@ -118,7 +118,7 @@ Orchestrate Demo VNF
     Validate Service Instance    ${service_instance_id}    ${service}      ${customer_name}
     ${vnflist}=   Get From Dictionary    ${GLOBAL_SERVICE_VNF_MAPPING}    ${service}
     ${generic_vnfs}=    Create Dictionary
-    :for   ${vnf}   in   @{vnflist}
+    :FOR   ${vnf}   IN   @{vnflist}
     \   ${vnf_name}=    Catenate    Ete_${vnf}_${uuid}
     \   ${vf_module_name}=    Catenate    Vfmodule_Demo_${vnf}_${uuid}
     \   ${vnf_type}=    Set Variable  ${vnf_json_resources['${vnf}']['vnf_type']}
@@ -160,7 +160,7 @@ Get Catalog Resource
     ${base_name}=  Get Name Pattern   ${vnf}
     ${keys}=    Get Dictionary Keys    ${resources}
 
-    :for   ${key}   in    @{keys}
+    :FOR   ${key}   IN    @{keys}
     \    ${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}
@@ -170,7 +170,7 @@ Get Name Pattern
     [Documentation]    To support services with multiple VNFs, we need to dig the vnf type out of the SDC catalog resources to select in the VID UI
     [Arguments]   ${vnf}
     ${list}=   Get From Dictionary    ${GLOBAL_SERVICE_TEMPLATE_MAPPING}   ${vnf}
-    :for    ${dict}   in   @{list}
+    :FOR    ${dict}   IN   @{list}
     \   ${base_name}=   Get From Dictionary    ${dict}    name_pattern
     \   Return From Keyword If   '${dict['isBase']}' == 'true'   ${base_name}
     Fail  Unable to locate base name pattern
@@ -237,23 +237,23 @@ Delete VNF
     [Documentation]    Called at the end of a test case to tear down the VNF created by Orchestrate VNF
     ${lcp_region}=   Get Openstack Region
     ${list}=    Create List
-    Set Test Variable    ${KEYPAIRS}   ${list}
     # remove duplicates, sort vFW-> vPKG , revers to get vPKG > vFWSNK
     ${sorted_stack_names}=    Create List
     ${sorted_stack_names}=  Remove Duplicates   ${STACK_NAMES}
     Sort List   ${sorted_stack_names}
     Reverse List   ${sorted_stack_names}
-    :for   ${stack}   in   @{sorted_stack_names}
-    \     Get Stack Keypairs   ${stack}
+    :FOR   ${stack}   IN   @{sorted_stack_names}
+    \     ${keypair_name}=    Get Stack Keypairs   ${stack}
+    \     Append To List   ${list}   ${keypair_name}
     Teardown VVG Server
     #Teardown VLB Closed Loop Hack
     Run Keyword and Ignore Error   Teardown VID   ${SERVICE_INSTANCE_ID}   ${lcp_region}   ${TENANT_NAME}   ${CUSTOMER_NAME}
     #
-    :for   ${stack}   in   @{sorted_stack_names}
+    :FOR   ${stack}   IN   @{sorted_stack_names}
     \    Run Keyword and Ignore Error    Teardown Stack    ${stack}
     \    Log    Stack Deleted ${stack}
     # only needed if stack deleted but not keypair
-    :for   ${key_pair}   in   @{KEYPAIRS}
+    :FOR   ${key_pair}   IN   @{list}
     \    Run Keyword and Ignore Error    Delete Stack Keypair  ${key_pair}
     \    Log    Key pair Deleted ${key_pair}
     Log    VNF Deleted
@@ -282,7 +282,7 @@ Get Stack Keypairs
     Log    ${stack_info}
     ${stack_id}=    Get From Dictionary    ${stack_info}    id
     ${key_pair_status}   ${keypair_name}=   Run Keyword And Ignore Error   Get From Dictionary    ${stack_info}    key_name
-    Append To List   ${KEYPAIRS}   ${keypair_name}
+    [Return]   ${keypair_name}
 
 Delete Stack Keypair
     [Documentation]  Delete keypairs from openstack
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 4775dcc2..e5626e6f 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
@@ -22,9 +22,9 @@ Resource    	../json_templater.robot
 Resource    	../so_interface.robot
 
 Library         OpenstackLibrary
-Library 	    ExtendedSelenium2Library
 Library	        UUID
 Library	        Collections
+Library         String
 Library         JSONUtils
 
 Library         RequestsLibrary
@@ -89,7 +89,7 @@ Orchestrate VNF With CDS
     ${list}=   	Create List
     ${vnfs}=   Get From Dictionary    ${jsondata['topology_template']}   node_templates
     ${keys}=   Get Dictionary Keys    ${vnfs}
-    :for   ${key}  in  @{keys}
+    :FOR   ${key}  IN  @{keys}
     \	 ${vnf}=   Get From Dictionary	  ${vnfs}   ${key}
     \    Get VNF Info	${key} 	${vnf}	${dict}
     \	 ${vf_modules}=    Get From Dictionary   ${jsondata['topology_template']}    groups
@@ -136,7 +136,7 @@ Get VFModule Info
     ${keys}=   Get Dictionary Keys    ${vfModules}
     ${data}=   Catenate
     ${delim}=   Catenate
-    :for   ${key}  in  @{keys}
+    :FOR   ${key}  IN  @{keys}
     \    ${module}=   Get From Dictionary    ${vfModules}   ${key}
     \    Log to console 	${vnf} ${key}
     \    Run keyword if 	"${vnf}" in "${key}"	set vfmodule param	${key}	  ${module}	${dict}