x/iotronic
Code Issues Proposed changes

Http to https redirect.

Browse Source 
Change-Id: Iffde3117b7d94e92991c4e7d5fb0cc4ff2a873c8
This commit is contained in:
Fabio Verboso
2019-02-04 15:44:35 +01:00
parent 4eb2314533
commit 4a7dc9166d
2 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
iotronic/conductor/endpoints.py
View File

@@ -596,7 +596,13 @@ class ConductorEndpoint(object):
except exception:
return exception
cctx = self.wamp_agent_client.prepare(server=board.agent)
cctx.call(ctx, 'add_redirect', board_dns=en_webservice.dns,
zone=en_webservice.zone, dns=newwbs.name)
cctx.call(ctx, 'reload_proxy')
newwbs.create()
return serializer.serialize_entity(ctx, newwbs)
def destroy_webservice(self, ctx, webservice_id):
@@ -632,6 +638,16 @@ class ConductorEndpoint(object):
except exception:
return exception
board = objects.Board.get_by_uuid(ctx, wbsrv.board_uuid)
if board.agent == None:
raise exception.BoardInvalidStatus(uuid=board.uuid,
status=board.status)
cctx = self.wamp_agent_client.prepare(server=board.agent)
cctx.call(ctx, 'remove_redirect', board_dns=en_webservice.dns,
zone=en_webservice.zone, dns=wbsrv.name)
cctx.call(ctx, 'reload_proxy')
wbsrv.destroy()
designate.delete_record(wbsrv.name + "." + en_webservice.dns,
en_webservice.zone)
@@ -717,7 +733,6 @@ class ConductorEndpoint(object):
cctx = self.wamp_agent_client.prepare(server=board.agent)
cctx.call(ctx, 'enable_webservice', board=dns,
https_port=https_port, http_port=http_port, zone=zone)
cctx.call(ctx, 'reload_proxy')
LOG.debug('Configure Web Proxy on Board %s with dns %s (email: %s) ',
board.uuid, dns, email)
@@ -731,6 +746,9 @@ class ConductorEndpoint(object):
except exception:
return exception
cctx.call(ctx, 'add_redirect', board_dns=dns, zone=zone)
cctx.call(ctx, 'reload_proxy')
return serializer.serialize_entity(ctx, en_webservice)
def disable_webservice(self, ctx, board_uuid):
@@ -784,6 +802,10 @@ class ConductorEndpoint(object):
cctx = self.wamp_agent_client.prepare(server=board.agent)
cctx.call(ctx, 'disable_webservice', board=webservice.dns)
# cctx.call(ctx, 'remove_redirect', board_dns=en_webservice.dns,
# zone=en_webservice.zone)
cctx.call(ctx, 'reload_proxy')
webservice.destroy()