Updated NodeRPCStartHandler to be compatible with new RPCStartHandler common (cc371b7e) · Commits · Mirror / cc-node

cloudcontrol/node/node.py

+6 −10

Original line number	Diff line number	Diff line
		@@ -30,9 +30,7 @@ logger = logging.getLogger(__name__)


		class NodeRPCStartHandler(RPCStartHandler):
		def auth_done_cb(self, call_id, response=None, error=None):
		RPCStartHandler.auth_done_cb(self, call_id, response, error)

		def handle_authentication_response(self, response=None):
		# set handler according to which role was returned by the cc-server
		if response == self.loop.role and response is not None:
		# we don't need to reload the plugins
		@@ -45,7 +43,7 @@ class NodeRPCStartHandler(RPCStartHandler):
		logger.debug('Role host affected')
		from cloudcontrol.node.host import Handler as HostHandler
		self.loop.main_plugin = HostHandler(loop=self.loop)
		self.loop.role = u'host'
		self.loop.role = 'host'
		# (re)-register the tags of the main loop
		self.loop.tag_db.rpc_register()
		self.loop.register_plugin(self.loop.main_plugin)
		@@ -65,18 +63,16 @@ class NodeRPCStartHandler(RPCStartHandler):
		hypervisor_name=self.loop.config.server_user,
		loop=self.loop,
		)
		self.loop.role = u'hv'
		self.loop.role = 'hv'
		# (re)-register the tags of the main loop
		self.loop.tag_db.rpc_register()
		self.loop.register_plugin(self.loop.main_plugin)
		else:
		logger.error('Failed authentication, role returned: %s', response)
		self.set_reconnect()
		return # we retry while it fails
		self._goto(self.handle_error)
		return

		self.stop()
		logger.info('Successfully authenticated with role %s', str(response))
		self.auth_id = None
		self._goto(self.handle_done)


		class NodeLoop(MainLoop):