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 <tsp@apache.org> 1351520707 +0530

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 import datetime
 
 

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 marvin.integration.lib.base import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 
 #Import Local Modules
 from marvin.cloudstackTestCase import *

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 
 #Import System modules
 import time

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 import datetime
 
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 import datetime
 
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 
 #Import System modules

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 
 #Import System modules

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import urllib
 from random import random

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 import datetime
 

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 marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from marvin.remoteSSHClient import remoteSSHClient
 #Import System modules
 import os

test/integration/smoke/test_disk_offerings.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 
 class Services:

test/integration/smoke/test_hosts.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 
 #Import System modules

test/integration/smoke/test_iso.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 import urllib
 from random import random

test/integration/smoke/test_network.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/smoke/test_primary_storage.py

@@ -20,10 +20,10 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
-from integration.lib.common import *
 
 #Import System modules
 import time
@@ -240,4 +240,4 @@ class TestPrimaryStorageServices(cloudstackTestCase):
             # Call cleanup for reusing primary storage
             cleanup_resources(self.apiclient, self.cleanup)
             self.cleanup = []
-        return
+        return

test/integration/smoke/test_routers.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/smoke/test_secondary_storage.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 
 #Import System modules

test/integration/smoke/test_service_offerings.py

@@ -20,9 +20,9 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 
 

test/integration/smoke/test_ssvm.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 import telnetlib
 

test/integration/smoke/test_templates.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.remoteSSHClient import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 import urllib
 from random import random

test/integration/smoke/test_vm_life_cycle.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.remoteSSHClient import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import time

test/integration/smoke/test_volumes.py

@@ -21,9 +21,9 @@ import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from marvin.remoteSSHClient import remoteSSHClient
-from integration.lib.utils import *
+from marvin.integration.lib.utils import *
-from integration.lib.base import *
+from marvin.integration.lib.base import *
-from integration.lib.common import *
+from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
 #Import System modules
 import os

test/setup-test-data.sh

@@ -20,6 +20,7 @@ usage() {
   printf "Usage: %s:\n
 	[-t path to tests ]  \n
 	[-m mgmt-server ] \n
+    [-h hypervisor (xen|kvm) ] \n
 	[-p hypervisor root password ] \n
 	[-d db node url ]\n" $(basename $0) >&2
 }
@@ -34,7 +35,7 @@ MGMT_SVR="localhost"
 DB_SVR="localhost"
 HV_PASSWD="password"
 
-while getopts 't:d:m:p:' OPTION
+while getopts 't:d:m:p:h:' OPTION
 do
   case $OPTION in
   d)    dflag=1
@@ -46,6 +47,9 @@ do
   m)    mflag=1
 		MGMT_SVR="$OPTARG"
 		;;
+  h)    hflag=1
+		HV="$OPTARG"
+		;;
   p)    pflag=1
 		HV_PASSWD="$OPTARG"
 		;;
@@ -56,7 +60,11 @@ do
 done
 
 #Damn Small Linux ISO type
-ostypeid=$(mysql -ucloud -Dcloud -pcloud -h$DB_SVR -s -N -r -e"select uuid from guest_os where display_name='CentOS 5.5 (64-bit)'")
+if [[ $HV == "kvm" ]]; then
+    ostypeid=$(mysql -ucloud -Dcloud -pcloud -h$DB_SVR -s -N -r -e"select uuid from guest_os where display_name='CentOS 5.5 (64-bit)'")
+else:
+    ostypeid=$(mysql -ucloud -Dcloud -pcloud -h$DB_SVR -s -N -r -e"select uuid from guest_os where display_name='CentOS 5.3 (64-bit)'")
+fi
 if [[ $ostypeid == "" ]]; then
     echo "Unable to contact DB server @ $DB_SVR"
     exit 2

tools/marvin/marvin/deployDataCenter.py

@@ -350,7 +350,7 @@ class deployDataCenters():
         return apiKey, securityKey
 
     def getCfg(self):
-        if self.config:
+        if self.config is not None:
             return self.config
         return None
 

tools/marvin/marvin/integration/__init__.py

@@ -0,0 +1,18 @@
+# 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.
+
+

tools/marvin/marvin/marvinPlugin.py

@@ -102,11 +102,11 @@ class MarvinPlugin(Plugin):
         self._injectClients(cls)
         
     def setClient(self, client):
-        if client:
+        if client is not None:
             self.testclient = client
 
     def setConfig(self, config):
-        if config:
+        if config is not None:
             self.config = config
 
     def _injectClients(self, test):

tools/marvin/setup.py

@@ -34,7 +34,9 @@ setup(name="Marvin",
       long_description="Marvin is the cloudstack testclient written around the python unittest framework",
       platforms=("Any",),
       url="http://jenkins.cloudstack.org:8080/job/marvin",
-      packages=["marvin", "marvin.cloudstackAPI", "marvin.sandbox", "marvin.sandbox.advanced", "marvin.sandbox.basic"],
+      packages=["marvin", "marvin.cloudstackAPI", "marvin.integration",
+                "marvin.integration.lib", "marvin.sandbox",
+                "marvin.sandbox.advanced", "marvin.sandbox.basic"],
       license="LICENSE.txt",
       install_requires=[
           "mysql-connector-python",