cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/marvin to ef94716
Date Thu, 10 Apr 2014 12:19:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/marvin f866bb21e -> ef9471692


CLOUDSTACK-5674: Remove assigning accountname which was useless


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef947169
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef947169
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef947169

Branch: refs/heads/marvin
Commit: ef9471692d485c6d4ae65fa334bca03cc18a3ca5
Parents: f866bb2
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Thu Apr 10 17:49:39 2014 +0530
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Thu Apr 10 17:49:39 2014 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_affinity_groups.py            |  5 +----
 .../test_deploy_vms_with_varied_deploymentplanners.py     |  1 -
 test/integration/smoke/test_iso.py                        |  1 -
 test/integration/smoke/test_pvlan.py                      |  4 +---
 test/integration/smoke/test_snapshots.py                  |  3 ---
 test/integration/smoke/test_templates.py                  |  5 -----
 test/integration/smoke/test_vm_snapshots.py               |  2 --
 test/integration/smoke/test_volumes.py                    |  6 +-----
 tools/marvin/marvin/config/test_data.py                   | 10 ++++++----
 9 files changed, 9 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/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 44d9bd1..4f3f9ec 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -60,16 +60,13 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
             cls.services["account"],
             domainid=cls.domain.id
         )
-
-        cls.services["account"] = cls.account.name
-
         cls.service_offering = ServiceOffering.create(
             cls.apiclient,
             cls.services["service_offerings"]
         )
 
         cls.ag = AffinityGroup.create(cls.apiclient, cls.services["virtual_machine"]["affinity"],
-            account=cls.services["account"], domainid=cls.domain.id)
+            account=cls.account.name, domainid=cls.domain.id)
 
         cls._cleanup = [
             cls.service_offering,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/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 d873a6c..420925e 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -54,7 +54,6 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             cls.services["account"],
             domainid=cls.domain.id
         )
-        cls.services["account"] = cls.account.name
         cls.hosts = Host.list(cls.apiclient, type='Routing')
         cls.clusters = Cluster.list(cls.apiclient)
         cls.cleanup = [

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/test/integration/smoke/test_iso.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py
index 408c164..6741633 100644
--- a/test/integration/smoke/test_iso.py
+++ b/test/integration/smoke/test_iso.py
@@ -163,7 +163,6 @@ class TestISO(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-        cls.services["account"] = cls.account.name
         # Finding the OsTypeId from Ostype
         ostypes = list_os_types(
                     cls.apiclient,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/test/integration/smoke/test_pvlan.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_pvlan.py b/test/integration/smoke/test_pvlan.py
index 964536c..b435367 100644
--- a/test/integration/smoke/test_pvlan.py
+++ b/test/integration/smoke/test_pvlan.py
@@ -78,6 +78,4 @@ class TestPVLAN(cloudstackTestCase):
         createNetworkCmd.endipv6="fc00:1234::20"
         err = 0
         createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd)
-        #FIXME: add assert for proper response
-
-
+        self.assertEqual(createNetworkResponse, FAILED, "Creating PVLAN with IPv6 should
fail")

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/test/integration/smoke/test_snapshots.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_snapshots.py b/test/integration/smoke/test_snapshots.py
index 2f6a42a..a960e70 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -55,9 +55,6 @@ class TestSnapshotRootDisk(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-
-        cls.services["account"] = cls.account.name
-
         cls.service_offering = ServiceOffering.create(
                                             cls.apiclient,
                                             cls.services["service_offerings"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/test/integration/smoke/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
index ca80e25..4865ee3 100644
--- a/test/integration/smoke/test_templates.py
+++ b/test/integration/smoke/test_templates.py
@@ -88,8 +88,6 @@ class TestCreateTemplate(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-        cls.services["account"] = cls.account.name
-
         cls.service_offering = ServiceOffering.create(
                                             cls.apiclient,
                                             cls.services["service_offerings"]
@@ -274,9 +272,6 @@ class TestTemplates(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-
-        cls.services["account"] = cls.account.name
-
         cls.service_offering = ServiceOffering.create(
                                             cls.apiclient,
                                             cls.services["service_offerings"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/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 e201d82..e884d42 100644
--- a/test/integration/smoke/test_vm_snapshots.py
+++ b/test/integration/smoke/test_vm_snapshots.py
@@ -55,8 +55,6 @@ class TestVmSnapshot(cloudstackTestCase):
                     domainid=cls.domain.id
                     )
 
-        cls.services["account"] = cls.account.name
-
         cls.service_offering = ServiceOffering.create(
                             cls.apiclient,
                             cls.services["service_offerings"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/test/integration/smoke/test_volumes.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
index 9dd8078..738d3c2 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -74,8 +74,6 @@ class TestCreateVolume(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-
-        cls.services["account"] = cls.account.name
         cls.service_offering = ServiceOffering.create(
                                             cls.apiclient,
                                             cls.services["service_offerings"]
@@ -193,7 +191,7 @@ class TestCreateVolume(cloudstackTestCase):
                                                       reconnect=True
                                                       )
             ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
-            self.debug(" Volume Size Expected %s  Actual :%s" %(vol_sz,ret[1]))         
       
+            self.debug(" Volume Size Expected %s  Actual :%s" %(vol_sz,ret[1]))
             self.virtual_machine.detach_volume(self.apiClient, volume)
             self.assertEqual(ret[0],SUCCESS,"Check if promised disk size actually available")
             time.sleep(self.services["sleep"])
@@ -259,8 +257,6 @@ class TestVolumes(cloudstackTestCase):
                             cls.services["account"],
                             domainid=cls.domain.id
                             )
-
-        cls.services["account"] = cls.account.name
         cls.service_offering = ServiceOffering.create(
                                             cls.apiclient,
                                             cls.services["service_offerings"]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef947169/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index fb7e5fa..88babf4 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -7,8 +7,8 @@ test_data = {
         "zone": "NA",
         "hypervisor": "XenServer",
         "vdomain": { "name": "domain" },
-	"email" : "test@test.com",
-	"gateway" : "172.1.1.1",
+	    "email" : "test@test.com",
+	    "gateway" : "172.1.1.1",
         "netmask" : "255.255.255.0",
         "startip" : "172.1.1.10",
         "endip" : "172.1.1.20",
@@ -382,8 +382,10 @@ test_data = {
             },
             "securitygroupenabled": "true"
         },
-        "vlan_range": "4090-4091",
-        "vlan":"4444",
+        "portableiprange_vlan": {
+                "part": ["4090-4091", "4092-4095"],
+                "full": "4090-4095"
+        },
         "nfs": {
             "url": "nfs://nfs/export/automation/1/testprimary",
             "name": "Primary XEN"


Mime
View raw message