Use the right .robot files for DataModels.robot

Change-Id: Ie01bbadc47622c507ed044ba07259a2ea8326593
Signed-off-by: Sam Hague <shague@redhat.com>
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/DataModels.robot b/csit/libraries/DataModels.robot
index c91169899c9ad1f1acb872f666438003295f13ab..76625ef8468c722775abb14fff879ec6ad106285 100644 (file)
--- a/csit/libraries/DataModels.robot
+++ b/csit/libraries/DataModels.robot
@@ -2,7 +2,6 @@
 Documentation     Library to deal with mdsal data models. Initially, as a common place to show and
 ...               debug a list of data models.
 Library           RequestsLibrary
-Variables         ../variables/netvirt/Variables.py
 
 *** Variables ***
 @{data_models}    ${EMPTY}

diff --git a/csit/suites/openstack/connectivity/01_l2_tests.robot b/csit/suites/openstack/connectivity/01_l2_tests.robot
index e5370cf124eca456d670787097dac067a969e2e4..d28929665d60d32503c58471be586d7466665c41 100644 (file)
--- a/csit/suites/openstack/connectivity/01_l2_tests.robot
+++ b/csit/suites/openstack/connectivity/01_l2_tests.robot
@@ -9,7 +9,7 @@ Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary
 Resource          ../../../libraries/DevstackUtils.robot
-Resource          ../../../libraries/Netvirt.robot
+Resource          ../../../libraries/DataModels.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot

diff --git a/csit/suites/openstack/connectivity/02_l3_tests.robot b/csit/suites/openstack/connectivity/02_l3_tests.robot
index e39656f0ddac216bda13cbde774290eea835d3db..63bbfc707a4b8e9f55602118f1c8620819ba0f7c 100644 (file)
--- a/csit/suites/openstack/connectivity/02_l3_tests.robot
+++ b/csit/suites/openstack/connectivity/02_l3_tests.robot
@@ -9,7 +9,7 @@ Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary
 Resource          ../../../libraries/DevstackUtils.robot
-Resource          ../../../libraries/Netvirt.robot
+Resource          ../../../libraries/DataModels.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot
index 1d970f53c32ea8f15c298c0ff54def81ace48a0e..924e27b60c1dcb60680541c9d4b411dfe835b087 100644 (file)
--- a/csit/suites/openstack/connectivity/03_external_network_tests.robot
+++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot
@@ -9,7 +9,7 @@ Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary
 Resource          ../../../libraries/DevstackUtils.robot
-Resource          ../../../libraries/Netvirt.robot
+Resource          ../../../libraries/DataModels.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot