Revision e49bdb7c snf-tools/synnefo_tools/burnin.py

b/snf-tools/synnefo_tools/burnin.py
432 432

  
433 433
        image = self.client.get_image_details(self.imageid)
434 434
        os = image["metadata"]["values"]["os"]
435
        loginname = image["metadata"]["values"].get("users", None)
435
        users = image["metadata"]["values"].get("users", None)
436 436
        self.client.update_server_metadata(self.serverid, OS=os)
437

  
438
        userlist = loginname.split()
437
        
438
        userlist = users.split()
439 439

  
440 440
        # Determine the username to use for future connections
441 441
        # to this host
......
690 690
        cls.serverid = dict()
691 691
        cls.username = dict()
692 692
        cls.password = dict()
693
        cls.is_windows = imagename.lower().find("windows") >= 0
694

  
695
    def _skipIf(self, condition, msg):
696
        if condition:
697
            self.skipTest(msg)
693 698

  
694 699
    def _get_ipv4(self, server):
695 700
        """Get the public IPv4 of a server from the detailed server info"""
......
966 971
    def test_003a_setup_interface_A(self):
967 972
        """Set up eth1 for server A"""
968 973

  
974
        self._skipIf(self.is_windows, "only valid for Linux servers")
975

  
969 976
        log.info("Setting up interface eth1 for server A")
970 977

  
971 978
        server = self.client.get_server_details(self.serverid['A'])
......
1016 1023
    def test_003b_setup_interface_B(self):
1017 1024
        """Setup eth1 for server B"""
1018 1025

  
1026
        self._skipIf(self.is_windows, "only valid for Linux servers")
1027

  
1019 1028
        log.info("Setting up interface eth1 for server B")
1020 1029

  
1021 1030
        server = self.client.get_server_details(self.serverid['B'])
......
1066 1075
    def test_003c_test_connection_exists(self):
1067 1076
        """Ping server B from server A to test if connection exists"""
1068 1077

  
1078
        self._skipIf(self.is_windows, "only valid for Linux servers")
1079

  
1069 1080
        log.info("Testing if server A is actually connected to server B")
1070 1081

  
1071 1082
        server = self.client.get_server_details(self.serverid['A'])
......
1104 1115

  
1105 1116
        self.assertTrue(exists)
1106 1117

  
1107
#TODO: Test IPv6 private connectity
1108 1118

  
1109 1119
    def test_004_disconnect_from_network(self):
1110 1120
        "Disconnecting server A and B from network"

Also available in: Unified diff