Commit 071b62c3 authored by Łukasz Nowak's avatar Łukasz Nowak

Extract instance in decorator.

parent 21cda2c5
...@@ -111,6 +111,36 @@ def responseSupport(anonymous=False): ...@@ -111,6 +111,36 @@ def responseSupport(anonymous=False):
return wrapperResponseSupport return wrapperResponseSupport
return outer return outer
def extractInstance(fn):
def wrapperExtractInstance(self, *args, **kwargs):
if not self.REQUEST['traverse_subpath']:
self.REQUEST.response.setStatus(404)
return self.REQUEST.response
instance_path = self.REQUEST['traverse_subpath'][:2]
try:
self.software_instance = self.restrictedTraverse(instance_path)
if getattr(self.software_instance, 'getPortalType', None) is None or \
self.software_instance.getPortalType() not in ('Software Instance',
'Slave Instance'):
raise WrongRequest('%r is not an instance' % instance_path)
except WrongRequest:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(404)
except (Unauthorized, KeyError):
self.REQUEST.response.setStatus(404)
except Exception:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(500)
self.REQUEST.response.setBody(json.dumps({'error':
'There is system issue, please try again later.'}))
else:
self.REQUEST['traverse_subpath'] = self.REQUEST['traverse_subpath'][2:]
return fn(self, *args, **kwargs)
return self.REQUEST.response
wrapperExtractInstance.__doc__ = fn.__doc__
return wrapperExtractInstance
class GenericPublisher(Implicit): class GenericPublisher(Implicit):
@responseSupport(True) @responseSupport(True)
def OPTIONS(self, *args, **kwargs): def OPTIONS(self, *args, **kwargs):
...@@ -131,6 +161,7 @@ class InstancePublisher(GenericPublisher): ...@@ -131,6 +161,7 @@ class InstancePublisher(GenericPublisher):
@requireHeader({'Accept': 'application/json', @requireHeader({'Accept': 'application/json',
'Content-Type': 'application/json'}) 'Content-Type': 'application/json'})
@requireJson(dict(log=unicode)) @requireJson(dict(log=unicode))
@extractInstance
def __bang(self): def __bang(self):
person = self.getPortalObject().ERP5Site_getAuthenticatedMemberPersonValue() person = self.getPortalObject().ERP5Site_getAuthenticatedMemberPersonValue()
if person is None: if person is None:
...@@ -142,28 +173,8 @@ class InstancePublisher(GenericPublisher): ...@@ -142,28 +173,8 @@ class InstancePublisher(GenericPublisher):
self.REQUEST.response.setBody(json.dumps({'error': self.REQUEST.response.setBody(json.dumps({'error':
'There is system issue, please try again later.'})) 'There is system issue, please try again later.'}))
return self.REQUEST.response return self.REQUEST.response
instance_path = '/'.join(self.REQUEST['traverse_subpath'][:-1])
try:
software_instance = self.restrictedTraverse(instance_path)
if getattr(software_instance, 'getPortalType', None) is None or \
software_instance.getPortalType() not in ('Software Instance',
'Slave Instance'):
raise WrongRequest('%r is not an instance' % instance_path)
except WrongRequest:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(404)
except (Unauthorized, KeyError):
self.REQUEST.response.setStatus(404)
except Exception:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(500)
self.REQUEST.response.setBody(json.dumps({'error':
'There is system issue, please try again later.'}))
else:
try: try:
software_instance.reportComputerPartitionBang(comment=self.jbody['log']) self.software_instance.reportComputerPartitionBang(comment=self.jbody['log'])
except Exception: except Exception:
LOG('VifibRestApiV1Tool', ERROR, LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to generate instance dict:', error=True) 'Problem while trying to generate instance dict:', error=True)
...@@ -230,49 +241,30 @@ class InstancePublisher(GenericPublisher): ...@@ -230,49 +241,30 @@ class InstancePublisher(GenericPublisher):
return response return response
@requireHeader({'Accept': 'application/json'}) @requireHeader({'Accept': 'application/json'})
@extractInstance
def __instance_info(self): def __instance_info(self):
certificate = False certificate = False
if self.REQUEST['traverse_subpath'][-1] == 'certificate': if self.REQUEST['traverse_subpath'] and self.REQUEST[
'traverse_subpath'][-1] == 'certificate':
certificate = True certificate = True
self.REQUEST['traverse_subpath'] = self.REQUEST['traverse_subpath'][:-1]
instance_path = '/'.join(self.REQUEST['traverse_subpath'])
try:
software_instance = self.restrictedTraverse(instance_path)
if getattr(software_instance, 'getPortalType', None) is None or \
software_instance.getPortalType() not in ('Software Instance',
'Slave Instance'):
raise WrongRequest('%r is not an instance' % instance_path)
except WrongRequest:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(404)
except (Unauthorized, KeyError):
self.REQUEST.response.setStatus(404)
except Exception:
LOG('VifibRestApiV1Tool', ERROR,
'Problem while trying to find instance:', error=True)
self.REQUEST.response.setStatus(500)
self.REQUEST.response.setBody(json.dumps({'error':
'There is system issue, please try again later.'}))
else:
try: try:
if certificate: if certificate:
d = { d = {
"ssl_key": software_instance.getSslKey(), "ssl_key": self.software_instance.getSslKey(),
"ssl_certificate": software_instance.getSslCertificate() "ssl_certificate": self.software_instance.getSslCertificate()
} }
else: else:
d = { d = {
"title": software_instance.getTitle(), "title": self.software_instance.getTitle(),
"status": software_instance.getSlapState(), "status": self.software_instance.getSlapState(),
"software_release": "", # not ready yet "software_release": "", # not ready yet
"software_type": software_instance.getSourceReference(), "software_type": self.software_instance.getSourceReference(),
"slave": software_instance.getPortalType() == 'Slave Instance', "slave": self.software_instance.getPortalType() == 'Slave Instance',
"connection": software_instance.getConnectionXmlAsDict(), "connection": self.software_instance.getConnectionXmlAsDict(),
"parameter": software_instance.getInstanceXmlAsDict(), "parameter": self.software_instance.getInstanceXmlAsDict(),
"sla": software_instance.getSlaXmlAsDict(), "sla": self.software_instance.getSlaXmlAsDict(),
"children_list": [q.absolute_url() for q in \ "children_list": [q.absolute_url() for q in \
software_instance.getPredecessorValueList()], self.software_instance.getPredecessorValueList()],
"partition": { # not ready yet "partition": { # not ready yet
"public_ip": [], "public_ip": [],
"private_ip": [], "private_ip": [],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment