You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/01/28 08:13:06 UTC
git commit: updated refs/heads/marvin to 6c5b167
Updated Branches:
refs/heads/marvin 7305063fb -> 6c5b1670b
CLOUDSTACK-5925: Removed incorrect import
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c5b1670
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c5b1670
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c5b1670
Branch: refs/heads/marvin
Commit: 6c5b1670b20951ad47ce6c7eb14efdd3b8f13b1b
Parents: 7305063
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Mon Jan 27 19:14:45 2014 -0500
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Mon Jan 27 19:14:45 2014 -0500
----------------------------------------------------------------------
test/integration/smoke/test_affinity_groups.py | 1 -
test/integration/smoke/test_deploy_vm.py | 1 -
test/integration/smoke/test_deploy_vm_with_userdata.py | 1 -
.../smoke/test_deploy_vms_with_varied_deploymentplanners.py | 1 -
test/integration/smoke/test_guest_vlan_range.py | 1 -
test/integration/smoke/test_hosts.py | 1 -
test/integration/smoke/test_internal_lb.py | 1 -
test/integration/smoke/test_iso.py | 1 -
test/integration/smoke/test_loadbalance.py | 1 -
test/integration/smoke/test_multipleips_per_nic.py | 1 -
test/integration/smoke/test_network.py | 1 -
test/integration/smoke/test_nic.py | 1 -
test/integration/smoke/test_non_contigiousvlan.py | 1 -
test/integration/smoke/test_portable_publicip.py | 1 -
test/integration/smoke/test_primary_storage.py | 1 -
test/integration/smoke/test_public_ip_range.py | 1 -
test/integration/smoke/test_regions.py | 1 -
test/integration/smoke/test_reset_vm_on_reboot.py | 1 -
test/integration/smoke/test_resource_detail.py | 1 -
test/integration/smoke/test_routers.py | 1 -
test/integration/smoke/test_scale_vm.py | 1 -
test/integration/smoke/test_service_offerings.py | 1 -
test/integration/smoke/test_snapshots.py | 1 -
test/integration/smoke/test_ssvm.py | 1 -
test/integration/smoke/test_templates.py | 1 -
test/integration/smoke/test_vm_life_cycle.py | 1 -
test/integration/smoke/test_vm_snapshots.py | 1 -
test/integration/smoke/test_volumes.py | 1 -
test/integration/smoke/test_vpc_vpn.py | 1 -
29 files changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index 5c0ff7d..b9f0049 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -16,7 +16,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_deploy_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm.py b/test/integration/smoke/test_deploy_vm.py
index e572c4d..913e5d3 100644
--- a/test/integration/smoke/test_deploy_vm.py
+++ b/test/integration/smoke/test_deploy_vm.py
@@ -16,7 +16,6 @@
# under the License.
#Test from the Marvin - Testing in Python wiki
-from marvin.cloudstackTestClient import getZoneForTests
#All tests inherit from cloudstackTestCase
from marvin.cloudstackTestCase import cloudstackTestCase
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_deploy_vm_with_userdata.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py
index d90db13..718f65b 100644
--- a/test/integration/smoke/test_deploy_vm_with_userdata.py
+++ b/test/integration/smoke/test_deploy_vm_with_userdata.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.integration.lib.base import (ServiceOffering,
VirtualMachine,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index d1f6d3d..475ef95 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering, Host, Cluster
from marvin.integration.lib.common import get_zone, get_domain, get_template
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index e76f3d5..fb5f170 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -17,7 +17,6 @@
""" P1 tests for Dedicating Guest Vlan Ranges
"""
#Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_hosts.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py
index 7525bda..ec81d4c 100644
--- a/test/integration/smoke/test_hosts.py
+++ b/test/integration/smoke/test_hosts.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_internal_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_internal_lb.py b/test/integration/smoke/test_internal_lb.py
index e53e4ed..c69d96a 100644
--- a/test/integration/smoke/test_internal_lb.py
+++ b/test/integration/smoke/test_internal_lb.py
@@ -17,7 +17,6 @@
""" Tests for configuring Internal Load Balancing Rules.
"""
#Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 376a17c..4e4db2b 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_loadbalance.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py
index 355dcc5..7bcf1d0 100644
--- a/test/integration/smoke/test_loadbalance.py
+++ b/test/integration/smoke/test_loadbalance.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_multipleips_per_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_multipleips_per_nic.py b/test/integration/smoke/test_multipleips_per_nic.py
index ad00dba..9b34b2c 100644
--- a/test/integration/smoke/test_multipleips_per_nic.py
+++ b/test/integration/smoke/test_multipleips_per_nic.py
@@ -31,7 +31,6 @@ from marvin.integration.lib.utils import cleanup_resources
#common - commonly used methods for all tests are listed here
from marvin.integration.lib.common import get_zone, get_domain, get_template
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackAPI.addIpToNic import addIpToNicCmd
from marvin.cloudstackAPI.removeIpFromNic import removeIpFromNicCmd
from marvin.cloudstackAPI.listNics import listNicsCmd
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 04a2bd3..4cb1fb4 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackException import cloudstackAPIException
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index 668e91f..9541eac 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -16,7 +16,6 @@
# under the License.
""" NIC tests for VM """
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_non_contigiousvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py
index efa4825..f1736ae 100644
--- a/test/integration/smoke/test_non_contigiousvlan.py
+++ b/test/integration/smoke/test_non_contigiousvlan.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin import cloudstackTestCase
from marvin.cloudstackAPI import *
from marvin.cloudstackTestCase import cloudstackTestCase
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_portable_publicip.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_portable_publicip.py b/test/integration/smoke/test_portable_publicip.py
index d75ae09..20d2150 100644
--- a/test/integration/smoke/test_portable_publicip.py
+++ b/test/integration/smoke/test_portable_publicip.py
@@ -16,7 +16,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index e06d90e..c719f0d 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_public_ip_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py
index 5e51de3..672da32 100644
--- a/test/integration/smoke/test_public_ip_range.py
+++ b/test/integration/smoke/test_public_ip_range.py
@@ -17,7 +17,6 @@
""" P1 tests for Dedicating Public IP addresses
"""
#Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
import marvin
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_regions.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_regions.py b/test/integration/smoke/test_regions.py
index fec96f0..259cc41 100644
--- a/test/integration/smoke/test_regions.py
+++ b/test/integration/smoke/test_regions.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_reset_vm_on_reboot.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_reset_vm_on_reboot.py b/test/integration/smoke/test_reset_vm_on_reboot.py
index f5ba0b8..96d8ac2 100644
--- a/test/integration/smoke/test_reset_vm_on_reboot.py
+++ b/test/integration/smoke/test_reset_vm_on_reboot.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_resource_detail.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_resource_detail.py b/test/integration/smoke/test_resource_detail.py
index 1ec571e..7fb3bd4 100644
--- a/test/integration/smoke/test_resource_detail.py
+++ b/test/integration/smoke/test_resource_detail.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index d200bf6..4e7a873 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_scale_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_scale_vm.py b/test/integration/smoke/test_scale_vm.py
index cc1c83c..7507b8f 100644
--- a/test/integration/smoke/test_scale_vm.py
+++ b/test/integration/smoke/test_scale_vm.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_service_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
index be14d15..916f9f2 100644
--- a/test/integration/smoke/test_service_offerings.py
+++ b/test/integration/smoke/test_service_offerings.py
@@ -17,7 +17,6 @@
""" BVT tests for Service offerings"""
#Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import changeServiceForVirtualMachine,updateServiceOffering
from marvin.integration.lib.utils import (isAlmostEqual,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index f4dbc83..9777770 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-from marvin.cloudstackTestClient import getZoneForTests
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_ssvm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
index b94e709..4c93031 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -19,7 +19,6 @@
#Import Local Modules
import marvin
from marvin.cloudstackTestCase import *
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index b9e32a1..c9a1520 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.sshClient import SshClient
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
index 0494672..110a65a 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_vm_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vm_snapshots.py b/test/integration/smoke/test_vm_snapshots.py
index 617274c..214fe50 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -17,7 +17,6 @@
# Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 860d989..81e8f02 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -18,7 +18,6 @@
"""
#Import Local Modules
import marvin
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackException import *
from marvin.cloudstackAPI import *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c5b1670/test/integration/smoke/test_vpc_vpn.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py
index a117c6e..c41c2a0 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -17,7 +17,6 @@
""" Tests for VPN in VPC
"""
#Import Local Modules
-from marvin.cloudstackTestClient import getZoneForTests
from marvin.cloudstackTestCase import *
from marvin.cloudstackAPI import *
from marvin.integration.lib.utils import *