aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-17 17:23:14 -0400
committerDR695H <dr695h@att.com>2019-06-17 17:23:14 -0400
commitd92b007061e149fc733a52ca1e142358955fce42 (patch)
treeef581a6d63bb7afc74f9be1bc0568370d865337e
parent288e86f420d6646aa1b88241827a1883b096b058 (diff)
adjust where we source keywords from
Issue-ID: TEST-158 Change-Id: Icf8085ad56185850e261c318441c52f03d2ad37a Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--red.xml5
-rw-r--r--robot/resources/aai/aai_interface.robot1
-rw-r--r--robot/resources/asdc_interface.robot2
-rw-r--r--robot/resources/openstack/cinder_interface.robot2
-rw-r--r--robot/resources/openstack/heat_interface.robot3
-rw-r--r--robot/resources/openstack/keystone_interface.robot3
-rw-r--r--robot/resources/openstack/neutron_interface.robot2
-rw-r--r--robot/resources/openstack/nova_interface.robot2
-rw-r--r--robot/resources/openstack/openstack_common.robot2
-rw-r--r--robot/resources/stack_validation/policy_check_vfw.robot3
-rw-r--r--robot/resources/stack_validation/validate_common.robot3
-rw-r--r--robot/resources/stack_validation/validate_dns_scaling.robot3
-rw-r--r--robot/resources/stack_validation/validate_vfw.robot3
-rw-r--r--robot/resources/test_templates/pnf_registration_without_SO_template.robot4
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot2
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot3
-rw-r--r--robot/testsuites/demo.robot1
17 files changed, 16 insertions, 28 deletions
diff --git a/red.xml b/red.xml
index be2f3823..9fb0ddf7 100644
--- a/red.xml
+++ b/red.xml
@@ -6,18 +6,15 @@
<referencedLibrary type="PYTHON" name="SeleniumLibrary" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="AngularJSLibrary" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="SSHLibrary" path="testsuite/robot/library"/>
- <referencedLibrary type="PYTHON" name="HTTPUtils" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="StringTemplater" path="testsuite/robot/library/eteutils"/>
- <referencedLibrary type="PYTHON" name="OpenstackLibrary" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="SoUtils" path="testsuite/robot/library/vcpeutils"/>
- <referencedLibrary type="PYTHON" name="HEATUtils" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="ArchiveLibrary" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="HeatBridge" path="testsuite/robot/library/heatbridge"/>
<referencedLibrary type="PYTHON" name="DateTime" path="testsuite/robot/library"/>
- <referencedLibrary type="PYTHON" name="SocketUtils" path="testsuite/robot/library/eteutils"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.Templating" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.ServiceMapping" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.JSON" path="testsuite/robot/library"/>
+ <referencedLibrary type="PYTHON" name="ONAPLibrary.Openstack" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.Kafka" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.Protobuf" path="testsuite/robot/library"/>
<referencedLibrary type="PYTHON" name="ONAPLibrary.Utilities" path="testsuite/robot/library"/>
diff --git a/robot/resources/aai/aai_interface.robot b/robot/resources/aai/aai_interface.robot
index 16853268..5580033f 100644
--- a/robot/resources/aai/aai_interface.robot
+++ b/robot/resources/aai/aai_interface.robot
@@ -2,7 +2,6 @@
Documentation The main interface for interacting with A&AI. It handles low level stuff like managing the http request library and A&AI required fields
Library RequestsLibrary
Library ONAPLibrary.Utilities
-Library HTTPUtils
Resource ../global_properties.robot
*** Variables ***
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index bef95843..d91786ca 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -9,7 +9,7 @@ Library SeleniumLibrary
Library String
Library StringTemplater
Library ArchiveLibrary
-Library HEATUtils
+Library ONAPLibrary.Openstack
Library DateTime
Library ONAPLibrary.ServiceMapping
Resource global_properties.robot
diff --git a/robot/resources/openstack/cinder_interface.robot b/robot/resources/openstack/cinder_interface.robot
index 7e11af3a..ab71d0f0 100644
--- a/robot/resources/openstack/cinder_interface.robot
+++ b/robot/resources/openstack/cinder_interface.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
Library ONAPLibrary.Utilities
Library OperatingSystem
diff --git a/robot/resources/openstack/heat_interface.robot b/robot/resources/openstack/heat_interface.robot
index e6ec504b..471c2a9f 100644
--- a/robot/resources/openstack/heat_interface.robot
+++ b/robot/resources/openstack/heat_interface.robot
@@ -1,9 +1,8 @@
*** Settings ***
Documentation The interface for interacting with Openstack Heat API.
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
Library OperatingSystem
-Library HEATUtils
Library StringTemplater
Library Collections
Resource ../global_properties.robot
diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot
index c6d5eddd..11dec823 100644
--- a/robot/resources/openstack/keystone_interface.robot
+++ b/robot/resources/openstack/keystone_interface.robot
@@ -1,8 +1,7 @@
*** Settings ***
Documentation The main interface for interacting with Openstack Keystone API. It handles low level stuff like managing the authtoken and Openstack required fields
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
-Library HTTPUtils
Library ONAPLibrary.Utilities
Library Collections
Library OperatingSystem
diff --git a/robot/resources/openstack/neutron_interface.robot b/robot/resources/openstack/neutron_interface.robot
index 5fdbbf80..63b3cd7c 100644
--- a/robot/resources/openstack/neutron_interface.robot
+++ b/robot/resources/openstack/neutron_interface.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
Library OperatingSystem
Library Collections
diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot
index e216a2f9..e02d3e72 100644
--- a/robot/resources/openstack/nova_interface.robot
+++ b/robot/resources/openstack/nova_interface.robot
@@ -1,6 +1,6 @@
*** Settings ***
Documentation The main interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
Library ONAPLibrary.JSON
Library OperatingSystem
diff --git a/robot/resources/openstack/openstack_common.robot b/robot/resources/openstack/openstack_common.robot
index a1ac04c5..04ac162c 100644
--- a/robot/resources/openstack/openstack_common.robot
+++ b/robot/resources/openstack/openstack_common.robot
@@ -2,7 +2,7 @@
Documentation The private interface for interacting with Openstack. It handles low level stuff like managing the authtoken and Openstack required fields
Library Collections
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library RequestsLibrary
Library ONAPLibrary.Utilities
Resource ../global_properties.robot
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot
index b6a29cc1..7ac8ef72 100644
--- a/robot/resources/stack_validation/policy_check_vfw.robot
+++ b/robot/resources/stack_validation/policy_check_vfw.robot
@@ -5,8 +5,7 @@ Library Process
Library SSHLibrary
Library RequestsLibrary
Library ONAPLibrary.JSON
-Library OpenstackLibrary
-Library HEATUtils
+Library ONAPLibrary.Openstack
Library Collections
Library String
Library ONAPLibrary.ServiceMapping
diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot
index 7d8ec964..383a0146 100644
--- a/robot/resources/stack_validation/validate_common.robot
+++ b/robot/resources/stack_validation/validate_common.robot
@@ -4,8 +4,7 @@ Library OperatingSystem
Library SSHLibrary
Library RequestsLibrary
Library ONAPLibrary.JSON
-Library OpenstackLibrary
-Library HEATUtils
+Library ONAPLibrary.Openstack
Library Collections
Resource ../../resources/openstack/keystone_interface.robot
Resource ../../resources/openstack/nova_interface.robot
diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot
index 0e0c6655..25ecc1ed 100644
--- a/robot/resources/stack_validation/validate_dns_scaling.robot
+++ b/robot/resources/stack_validation/validate_dns_scaling.robot
@@ -4,8 +4,7 @@ Library OperatingSystem
Library SSHLibrary
Library RequestsLibrary
Library ONAPLibrary.JSON
-Library OpenstackLibrary
-Library HEATUtils
+Library ONAPLibrary.Openstack
Library Collections
Resource ../../resources/openstack/keystone_interface.robot
Resource ../../resources/openstack/nova_interface.robot
diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index fde3de21..a5a6acbc 100644
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -4,8 +4,7 @@ Library OperatingSystem
Library SSHLibrary
Library RequestsLibrary
Library ONAPLibrary.JSON
-Library OpenstackLibrary
-Library HEATUtils
+Library ONAPLibrary.Openstack
Library Collections
Resource ../../resources/openstack/keystone_interface.robot
Resource ../../resources/openstack/nova_interface.robot
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 12510f70..3f8d5bec 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -3,12 +3,12 @@ Documentation PNF Registration Handler (PRH) test cases
Resource ../aai/aai_interface.robot
Resource ../mr_interface.robot
Resource ../json_templater.robot
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library OperatingSystem
Library RequestsLibrary
Library Collections
Library ONAPLibrary.JSON
-Library HTTPUtils
+Library ONAPLibrary.Utilities
*** Variables ***
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 86595975..6b84a424 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -18,7 +18,7 @@ Resource ../openstack/neutron_interface.robot
Resource ../heatbridge.robot
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library SeleniumLibrary
Library Collections
Library ONAPLibrary.Utilities
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 f6c33c1b..9c424b37 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
@@ -21,7 +21,7 @@ Resource ../global_properties.robot
Resource ../json_templater.robot
Resource ../so_interface.robot
-Library OpenstackLibrary
+Library ONAPLibrary.Openstack
Library ONAPLibrary.Utilities
Library Collections
Library String
@@ -29,7 +29,6 @@ Library ONAPLibrary.JSON
Library RequestsLibrary
Library OperatingSystem
-Library HEATUtils
Library StringTemplater
Library Collections
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index 1e9e8d4d..412c9cd1 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -2,7 +2,6 @@
Documentation Executes the VNF Orchestration Test cases including setup and teardown
...
Library Collections
-Library HTTPUtils
Resource ../resources/demo_preload.robot
Resource ../resources/asdc_interface.robot
*** Variables ***