Skip to content

Commit bf72441

Browse files
Santhosh EdukullaGirish Shilamkar
Santhosh Edukulla
authored and
Girish Shilamkar
committed
CLOUDSTACK-6006: Remove integration folder and lib
1 parent a908b8d commit bf72441

132 files changed

Lines changed: 433 additions & 436 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/test/integration/api/test/account/testCreateAccount.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import factory
1919
import marvin
2020
from marvin import cloudstackTestCase
21-
from marvin.integration.lib.base import *
22-
from marvin.integration.lib import utils
21+
from marvin.lib.base import *
22+
from marvin.lib import utils
2323

2424
class AccountFactory(factory.Factory):
2525
FACTORY_FOR = createAccount.createAccountCmd

‎test/integration/component/maint/test_egress_rules_host_maintenance.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
2525
from marvin.sshClient import SshClient
26-
from marvin.integration.lib.utils import *
27-
from marvin.integration.lib.base import *
28-
from marvin.integration.lib.common import *
26+
from marvin.lib.utils import *
27+
from marvin.lib.base import *
28+
from marvin.lib.common import *
2929

3030
#Import System modules
3131
import time

‎test/integration/component/maint/test_high_availability.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
from nose.plugins.attrib import attr
2424
from marvin.cloudstackTestCase import *
2525
from marvin.cloudstackAPI import *
26-
from marvin.integration.lib.utils import *
27-
from marvin.integration.lib.base import *
28-
from marvin.integration.lib.common import *
26+
from marvin.lib.utils import *
27+
from marvin.lib.base import *
28+
from marvin.lib.common import *
2929
from marvin.sshClient import SshClient
3030
import datetime
3131

‎test/integration/component/maint/test_host_high_availability.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
from nose.plugins.attrib import attr
2222
from marvin.cloudstackTestCase import *
2323
from marvin.cloudstackAPI import *
24-
from marvin.integration.lib.utils import *
25-
from marvin.integration.lib.base import *
26-
from marvin.integration.lib.common import *
24+
from marvin.lib.utils import *
25+
from marvin.lib.base import *
26+
from marvin.lib.common import *
2727

2828

2929
class Services:

‎test/integration/component/maint/test_multiple_ip_ranges.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
from marvin.cloudstackTestCase import *
2020
from marvin.cloudstackAPI import *
2121
from marvin.cloudstackException import cloudstackAPIException
22-
from marvin.integration.lib.utils import *
23-
from marvin.integration.lib.base import *
24-
from marvin.integration.lib.common import *
22+
from marvin.lib.utils import *
23+
from marvin.lib.base import *
24+
from marvin.lib.common import *
2525
# from netaddr import *
2626
import netaddr
2727
from nose.plugins.attrib import attr

‎test/integration/component/maint/test_redundant_router.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# under the License.
1717

1818
from nose.plugins.attrib import attr
19-
from marvin.integration.lib.base import *
20-
from marvin.integration.lib.utils import *
21-
from marvin.integration.lib.common import *
19+
from marvin.lib.base import *
20+
from marvin.lib.utils import *
21+
from marvin.lib.common import *
2222

2323
#Import Local Modules
2424
from marvin.cloudstackTestCase import cloudstackTestCase

‎test/integration/component/maint/test_redundant_router_deployment_planning.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# under the License.
1717

1818
from nose.plugins.attrib import attr
19-
from marvin.integration.lib.base import *
20-
from marvin.integration.lib.utils import *
21-
from marvin.integration.lib.common import *
19+
from marvin.lib.base import *
20+
from marvin.lib.utils import *
21+
from marvin.lib.common import *
2222

2323
#Import Local Modules
2424
from marvin.cloudstackTestCase import cloudstackTestCase

‎test/integration/component/maint/test_redundant_router_network_rules.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
# under the License.
1717

1818
from nose.plugins.attrib import attr
19-
from marvin.integration.lib.base import *
20-
from marvin.integration.lib.utils import *
21-
from marvin.integration.lib.common import *
19+
from marvin.lib.base import *
20+
from marvin.lib.utils import *
21+
from marvin.lib.common import *
2222

2323
#Import Local Modules
2424
from marvin.cloudstackTestCase import cloudstackTestCase

‎test/integration/component/maint/test_vpc_host_maintenance.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
from nose.plugins.attrib import attr
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
25-
from marvin.integration.lib.utils import *
26-
from marvin.integration.lib.base import *
27-
from marvin.integration.lib.common import *
25+
from marvin.lib.utils import *
26+
from marvin.lib.base import *
27+
from marvin.lib.common import *
2828
from marvin.sshClient import SshClient
2929
import datetime
3030

‎test/integration/component/maint/test_vpc_on_host_maintenance.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
from nose.plugins.attrib import attr
1919
from marvin.cloudstackTestCase import *
2020
from marvin.cloudstackAPI import *
21-
from marvin.integration.lib.utils import *
22-
from marvin.integration.lib.base import *
23-
from marvin.integration.lib.common import *
21+
from marvin.lib.utils import *
22+
from marvin.lib.base import *
23+
from marvin.lib.common import *
2424

2525

2626
class Services:

0 commit comments

Comments
 (0)