Revision c1d11f96 snf-cyclades-app/synnefo/tools/burnin.py

b/snf-cyclades-app/synnefo/tools/burnin.py
222 222
    def _get_ipv4(self, server):
223 223
        """Get the public IPv4 of a server from the detailed server info"""
224 224

  
225
        details = 
226 225
        public_addrs = filter(lambda x: x["id"] == "public",
227 226
                              server["addresses"]["values"])
228 227
        self.assertEqual(len(public_addrs), 1)
......
394 393
        image = self.client.get_image_details(self.imageid)
395 394
        os = image["metadata"]["values"]["os"]
396 395
        loginname = image["metadata"]["values"].get("users", None)
397
        self.client.update_server_metadata(self.serverid, 'os'=os)
396
        self.client.update_server_metadata(self.serverid, OS=os)
398 397

  
399 398
        # Determine the username to use for future connections
400 399
        # to this host
......
641 640
def _spawn_server_test_case(**kwargs):
642 641
    """Construct a new unit test case class from SpawnServerTestCase"""
643 642

  
644
    name = "SpawnServerTestCase_%d" % kwargs["imageid"]
643
    name = "SpawnServerTestCase_%s" % kwargs["imageid"]
645 644
    cls = type(name, (SpawnServerTestCase,), kwargs)
646 645

  
647 646
    # Patch extra parameters into test names by manipulating method docstrings
......
843 842
        personality = None   # FIXME
844 843
        servername = "%s%s for %s" % (SNF_TEST_PREFIX, TEST_RUN_ID, imagename)
845 844
        is_windows = imagename.lower().find("windows") >= 0
846
        case = _spawn_server_test_case(imageid=imageid, flavorid=flavorid,
845
        case = _spawn_server_test_case(imageid=str(imageid), flavorid=flavorid,
847 846
                                       imagename=imagename,
848 847
                                       personality=personality,
849 848
                                       servername=servername,

Also available in: Unified diff