[WORKER]+[MGM]: gearman needs string names, ports need ints, socks need close
Change-Id: I72c9730ccb53bfe3fbe5291d8e6e7ec5099272e9
This commit is contained in:
		@@ -69,7 +69,7 @@ class BuildController(object):
 | 
			
		||||
            if self.msg[self.RESPONSE_FIELD] == self.RESPONSE_SUCCESS:
 | 
			
		||||
                status = self._test_node(self.msg['name'])
 | 
			
		||||
                if not status:
 | 
			
		||||
                    self.msg[self.RESPONSE_FIELD] == self.RESPONSE_FAILURE
 | 
			
		||||
                    self.msg[self.RESPONSE_FIELD] = self.RESPONSE_FAILURE
 | 
			
		||||
            return self.msg
 | 
			
		||||
        else:
 | 
			
		||||
            self.logger.error(
 | 
			
		||||
@@ -144,7 +144,7 @@ class BuildController(object):
 | 
			
		||||
 | 
			
		||||
        job_data = {'hpcs_action': 'DIAGNOSTICS'}
 | 
			
		||||
        job_status = gm_client.submit_job(
 | 
			
		||||
            name, job_data, background=False, wait_until_complete=True,
 | 
			
		||||
            str(name), job_data, background=False, wait_until_complete=True,
 | 
			
		||||
            max_retries=10, poll_timeout=10
 | 
			
		||||
        )
 | 
			
		||||
        if job_status.state == JOB_UNKNOWN:
 | 
			
		||||
@@ -157,7 +157,7 @@ class BuildController(object):
 | 
			
		||||
            return False
 | 
			
		||||
        self.logger.debug(job_status.result)
 | 
			
		||||
        # Would only happen if DIAGNOSTICS call not supported
 | 
			
		||||
        if job_status.result['hpcs_result'] == 'FAIL':
 | 
			
		||||
        if job_status.result['hpcs_response'] == 'FAIL':
 | 
			
		||||
            return True
 | 
			
		||||
 | 
			
		||||
        if job_status.result['network'] == 'FAIL':
 | 
			
		||||
 
 | 
			
		||||
@@ -66,7 +66,8 @@ class PoolMgmController(object):
 | 
			
		||||
            self.msg = controller.run()
 | 
			
		||||
            # Delete a built device if it has failed
 | 
			
		||||
            if (
 | 
			
		||||
                action == 'BUILD_DEVICE' and self.msg == self.RESPONSE_FAILURE
 | 
			
		||||
                action == 'BUILD_DEVICE'
 | 
			
		||||
                and self.msg[self.RESPONSE_FIELD] == self.RESPONSE_FAILURE
 | 
			
		||||
                and 'name' in self.msg
 | 
			
		||||
            ):
 | 
			
		||||
                delete_msg = {'name': self.msg['name']}
 | 
			
		||||
 
 | 
			
		||||
@@ -104,6 +104,7 @@ class AssignIpController(object):
 | 
			
		||||
        while True:
 | 
			
		||||
            try:
 | 
			
		||||
                sock.connect((ip, port))
 | 
			
		||||
                sock.close()
 | 
			
		||||
                return True
 | 
			
		||||
            except socket.error:
 | 
			
		||||
                loop_count += 1
 | 
			
		||||
@@ -112,6 +113,7 @@ class AssignIpController(object):
 | 
			
		||||
                        "TCP connect error after floating IP assign {0}"
 | 
			
		||||
                        .format(ip)
 | 
			
		||||
                    )
 | 
			
		||||
                    sock.close()
 | 
			
		||||
                    raise
 | 
			
		||||
                time.sleep(2)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -93,7 +93,7 @@ class LBaaSController(object):
 | 
			
		||||
        for host_port in self.gearman:
 | 
			
		||||
            host, port = host_port.split(':')
 | 
			
		||||
            try:
 | 
			
		||||
                self._check_host(host, port)
 | 
			
		||||
                self._check_host(host, int(port))
 | 
			
		||||
            except:
 | 
			
		||||
                self.msg['gearman'].append(
 | 
			
		||||
                    {'host': host, 'status': self.RESPONSE_FAILURE}
 | 
			
		||||
@@ -120,6 +120,7 @@ class LBaaSController(object):
 | 
			
		||||
        sock.settimeout(5)
 | 
			
		||||
        try:
 | 
			
		||||
            sock.connect((ip, port))
 | 
			
		||||
            sock.close()
 | 
			
		||||
            return True
 | 
			
		||||
        except socket.error:
 | 
			
		||||
            self.logger.error(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user