moving test data to top level dictionary

Prasanna Santhanam · Prasanna Santhanam · commit 64522b6bd582 · 2013-05-07T13:52:12.000+05:30
Signed-off-by: Prasanna Santhanam &lt;tsp@apache.org&gt;
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
@@ -43,7 +43,8 @@ def __init__(self):
                                     "username": "test",
                                     "password": "password",
                          },
-                        "name": "testphysicalnetwork"
+                        "name": "testphysicalnetwork",
+                        "vlan": "2118-2120",
                     }
 
 
@@ -64,14 +65,21 @@ def setUpClass(cls):
                             domainid=cls.domain.id
                             )
         cls._cleanup = [
-                        #cls.account,
+                        cls.account,
                         ]
         return
 
     @classmethod
     def tearDownClass(cls):
         try:
             # Cleanup resources used
+            list_physical_network_response = PhysicalNetwork.list(cls.api_client)
+            if list_physical_network_response is not None and len(list_physical_network_response) > 0:
+                physical_network = list_physical_network_response[0]
+                removeGuestVlanRangeResponse = \
+                physical_network.update(cls.api_client,
+                        id=physical_network.id,
+                        removevlan=cls.services["vlan"])
             cleanup_resources(cls.api_client, cls._cleanup)
         except Exception as e:
             raise Exception("Warning: Exception during cleanup : %s" % e)
@@ -119,12 +127,12 @@ def test_dedicateGuestVlanRange(self):
         physical_network_response = list_physical_network_response[0]
 
         self.debug("Adding guest vlan range")
-        addGuestVlanRangeResponse = physical_network_response.update(self.apiclient, id=physical_network_response.id, vlan="387-390")
+        addGuestVlanRangeResponse = physical_network_response.update(self.apiclient, id=physical_network_response.id, vlan=self.services["vlan"])
 
         self.debug("Dedicating guest vlan range");
         dedicate_guest_vlan_range_response = PhysicalNetwork.dedicate(
                                                 self.apiclient,
-                                                "387-390",
+                                                self.services["vlan"],
                                                 physicalnetworkid=physical_network_response.id,
                                                 account=self.account.name,
                                                 domainid=self.account.domainid
@@ -153,5 +161,3 @@ def test_dedicateGuestVlanRange(self):
                             "Check account name is system account in listDedicatedGuestVlanRanges"
                         )
         
-        self.debug("Removing guest vlan range")
-        removeGuestVlanRangeResponse = physical_network_response.update(self.apiclient, id=physical_network_response.id, removevlan="387-390")
diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py
@@ -113,7 +113,7 @@ def sign(self, payload):
         )
         signature = base64.encodestring(hmac.new(
             self.securityKey, hashStr, hashlib.sha1).digest()).strip()
-        self.logging.info("Computed Signature by Marvin: %s" % signature)
+        self.logging.debug("Computed Signature by Marvin: %s" % signature)
         return signature
 
     def request(self, command, auth=True, payload={}, method='GET'):

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ def sign(self, payload):`
`113`	`113`	`)`
`114`	`114`	`signature = base64.encodestring(hmac.new(`
`115`	`115`	`self.securityKey, hashStr, hashlib.sha1).digest()).strip()`
`116`		`- self.logging.info("Computed Signature by Marvin: %s" % signature)`
	`116`	`+ self.logging.debug("Computed Signature by Marvin: %s" % signature)`
`117`	`117`	`return signature`
`118`	`118`
`119`	`119`	`def request(self, command, auth=True, payload={}, method='GET'):`