You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/10/29 15:53:19 UTC
[1/5] git commit: Summary: Moving the test integration libraries into
marvin for CLI work
Updated Branches:
refs/heads/master c68c7e2a2 -> 802ddd43c
Summary: Moving the test integration libraries into marvin for CLI work
Detail: Integration tests use these libraries (base,utils,common) for
simplifying the usage of the API. These define the verbs of each
entity's usage (create, delete, add etc). For the CLI to present the
simplified API we'll leverage the integration libraries.
+ Fixes to setup-test-data.sh - kvm and xen each use a different version
of the built-in Cent OS template, 5.5 and 5.3 namely.
At a later point the setup-test-data script needs to be obsoleted.
ostypeids in tests should directly be determined from listOsTypes API
calls
Signed-off-by: Prasanna Santhanam <ts...@apache.org> 1351520707 +0530
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/802ddd43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/802ddd43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/802ddd43
Branch: refs/heads/master
Commit: 802ddd43ca444586b4d0e51bcf9072a1e49aefd5
Parents: c68c7e2
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Mon Oct 29 19:55:07 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Oct 29 20:23:02 2012 +0530
----------------------------------------------------------------------
test/integration/component/test_accounts.py | 6 +-
.../component/test_allocation_states.py | 6 +-
test/integration/component/test_blocker_bugs.py | 6 +-
test/integration/component/test_egress_rules.py | 6 +-
test/integration/component/test_eip_elb.py | 6 +-
.../integration/component/test_network_offering.py | 6 +-
test/integration/component/test_project_configs.py | 6 +-
test/integration/component/test_project_limits.py | 6 +-
.../component/test_project_resources.py | 6 +-
test/integration/component/test_project_usage.py | 6 +-
test/integration/component/test_projects.py | 6 +-
test/integration/component/test_resource_limits.py | 6 +-
test/integration/component/test_routers.py | 6 +-
test/integration/component/test_security_groups.py | 6 +-
test/integration/component/test_snapshots.py | 6 +-
test/integration/component/test_templates.py | 6 +-
test/integration/component/test_usage.py | 6 +-
test/integration/component/test_volumes.py | 6 +-
test/integration/lib/__init__.py | 16 -
test/integration/lib/base.py | 2146 ---------------
test/integration/lib/common.py | 515 ----
test/integration/lib/utils.py | 179 --
test/integration/smoke/test_disk_offerings.py | 6 +-
test/integration/smoke/test_hosts.py | 6 +-
test/integration/smoke/test_iso.py | 6 +-
test/integration/smoke/test_network.py | 6 +-
test/integration/smoke/test_primary_storage.py | 8 +-
test/integration/smoke/test_routers.py | 6 +-
test/integration/smoke/test_secondary_storage.py | 6 +-
test/integration/smoke/test_service_offerings.py | 6 +-
test/integration/smoke/test_ssvm.py | 6 +-
test/integration/smoke/test_templates.py | 6 +-
test/integration/smoke/test_vm_life_cycle.py | 6 +-
test/integration/smoke/test_volumes.py | 6 +-
test/setup-test-data.sh | 12 +-
tools/marvin/marvin/deployDataCenter.py | 2 +-
tools/marvin/marvin/integration/__init__.py | 18 +
tools/marvin/marvin/integration/lib/__init__.py | 16 +
tools/marvin/marvin/integration/lib/base.py | 2146 +++++++++++++++
tools/marvin/marvin/integration/lib/common.py | 515 ++++
tools/marvin/marvin/integration/lib/utils.py | 179 ++
tools/marvin/marvin/marvinPlugin.py | 4 +-
tools/marvin/setup.py | 4 +-
43 files changed, 2981 insertions(+), 2953 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 641f6fd..d0b4434 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -19,9 +19,9 @@
#Import Local Modules
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_allocation_states.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py
index 8bf2dc4..006f879 100644
--- a/test/integration/component/test_allocation_states.py
+++ b/test/integration/component/test_allocation_states.py
@@ -19,9 +19,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_blocker_bugs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index d40fc9f..cc5da0a 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -18,9 +18,9 @@
"""
import marvin
from nose.plugins.attrib import attr
-from integration.lib.base import *
-from integration.lib.utils import *
-from integration.lib.common import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.common import *
#Import Local Modules
from marvin.cloudstackTestCase import *
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index f888163..73a91f4 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -23,9 +23,9 @@ from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.remoteSSHClient import remoteSSHClient
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
#Import System modules
import time
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_eip_elb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py
index c3d650b..4c8dcbe 100644
--- a/test/integration/component/test_eip_elb.py
+++ b/test/integration/component/test_eip_elb.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index 35cc011..c1a518b 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index c82bf13..d5ce9d6 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index c1ef86a..8f7c128 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index cf3b593..27452be 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index c171e3c..4561576 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index 26d4a6f..811d092 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index f182ed1..cd007f1 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py
index dde8aa4..a65c5c3 100644
--- a/test/integration/component/test_routers.py
+++ b/test/integration/component/test_routers.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
#Import System modules
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 5c737d7..13a87b6 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -22,9 +22,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
#Import System modules
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py
index 34a1e03..27c960f 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index 407f8ed..e6b2dd6 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import urllib
from random import random
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index e5684f8..34dbc37 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
import datetime
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/component/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py
index 3bad5f1..5819001 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -21,9 +21,9 @@ import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
-from integration.lib.utils import *
-from integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.utils import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
from marvin.remoteSSHClient import remoteSSHClient
#Import System modules
import os
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/802ddd43/test/integration/lib/__init__.py
----------------------------------------------------------------------
diff --git a/test/integration/lib/__init__.py b/test/integration/lib/__init__.py
deleted file mode 100644
index 978b68a..0000000
--- a/test/integration/lib/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.