Michael Pasternak has uploaded a new change for review.
Change subject: codegen: cleanup
......................................................................
codegen: cleanup
Change-Id: I1d10588d325ad3b0249988a1252dbf529267b527
Signed-off-by: Michael Pasternak <mpast...@redhat.com>
---
M src/codegen/main.py
1 file changed, 87 insertions(+), 118 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-sdk refs/changes/82/12482/1
diff --git a/src/codegen/main.py b/src/codegen/main.py
index cb93909..4a780a9 100644
--- a/src/codegen/main.py
+++ b/src/codegen/main.py
@@ -39,19 +39,17 @@
KNOWN_ACTIONS = ['get', 'add', 'delete', 'update']
-#TODO:should be fixed on server side
+# TODO:should be fixed on server side
COLLECTION_TO_ENTITY_EXCEPTIONS = ['Capabilities', 'Storage', 'VersionCaps']
-#TODO:should be fixed on server side (naming inconsistency)
+# TODO:should be fixed on server side (naming inconsistency)
NAMING_ENTITY_EXCEPTIONS = {'host_storage':'storage'}
-#names that should not be used as method/s names
+# names that should not be used as method/s names
PRESERVED_NAMES = ['import', 'from']
-#xml wrapper (actual server) types
+# xml wrapper (actual server) types
KNOWN_WRAPPER_TYPES = {}
-
-DEBUG = False
class CodeGen():
""" Generates oVirt python bindings based on api RSDL meta """
@@ -59,19 +57,11 @@
def __init__(self):
self.__api = API(url=SERVER, username=USER, password=PASSWORD)
self.context = self.__api.id
- self.__conn = Connection(url=SERVER,
- port=None,
- key_file=None,
- cert_file=None,
- ca_file=None,
- strict=False,
- timeout=None,
- username=USER,
- password=PASSWORD,
- manager=self,
- debug=False)
+ self.__conn = Connection(url=SERVER, port=None, key_file=None,
cert_file=None,
+ ca_file=None, strict=False, timeout=None,
username=USER,
+ password=PASSWORD, manager=self, debug=False)
- def generate_code(self):
+ def generate(self):
""" Generates resources brokers """
collectionsHolder = {}
@@ -79,51 +69,42 @@
for link in context.manager[self.context].get('proxy') \
.request('GET', '/api?rsdl') \
- .links \
- .link:
+ .links.link:
response_type = None
body_type = None
- #link metadata
+ # link metadata
rel = link.rel
url = link.href
if (not (rel + '_' + url) in usedRels):
- #request
+
+ # request
http_method = link.request.http_method
if (link.request and link.request.body and
hasattr(link.request.body, 'type_')):
body_type = link.request.body.type_
- #response
+ # response
response = link.response
if (link.response and hasattr(link.response, 'type_')):
response_type = self.__toSingular(response.type_)
- #get relations
+ # get relations
splitted_url = url.strip()[1:].split('/')
splitted_url.pop(0)
- #check for exceptions from known pattern
- #self.__checkIfTooDeep(splitted_url, rel, url, http_method)
-
- #append resource/method/rel
- self.__appendResource(rel,
- url,
- http_method,
- body_type,
- link,
- response_type,
- self.__toMap(rel, splitted_url),
- collectionsHolder,
- KNOWN_ACTIONS)
+ # append resource/method/rel
+ self.__appendResource(rel, url, http_method, body_type, link,
+ response_type, self.__toMap(rel,
splitted_url),
+ collectionsHolder, KNOWN_ACTIONS)
usedRels.append(rel + '_' + url)
- #create root collection/s instances in entry point
+ # create root collection/s instances in entry point
self.__appendRootCollections(collectionsHolder)
- #store content
+ # store content
self.__persist(collectionsHolder)
def __persist(self, collectionsHolder):
@@ -139,10 +120,11 @@
keys.sort()
for k in keys:
if collectionsHolder[k].has_key('sub_collections'):
- collectionsHolder[k]['body'] =
(collectionsHolder[k]['body'].replace(Resource.SUB_COLLECTIONS_FIXME,
-
Resource.addSubCollectionInstances('self', #k.lower(),
-
collectionsHolder[k]['sub_collections']))) \
-
.replace(Resource.SUB_COLLECTIONS_FIXME, '')
+ collectionsHolder[k]['body'] = \
+
(collectionsHolder[k]['body'].replace(Resource.SUB_COLLECTIONS_FIXME,
+
Resource.addSubCollectionInstances('self', # k.lower(),
+
collectionsHolder[k]['sub_collections']))) \
+
.replace(Resource.SUB_COLLECTIONS_FIXME, '')
f.write(collectionsHolder[k]['body'])
f.flush()
@@ -154,8 +136,10 @@
f_api.write(EntryPoint.entryPoint(self.__api,
root_coll_candidates, coll_candidates))
f_api.flush()
finally:
- if f: f.close()
- if f_api: f_api.close()
+ if f and not f.closed:
+ f.close()
+ if f_api and not f_api.closed:
+ f_api.close()
def __toMap(self, rel, resources=[]):
dct = OrderedDict()
@@ -177,102 +161,106 @@
if (v.has_key('root_collection') and v['root_collection'] == True):
collections += v['name'] + ' = ' +
self.__toResourceType(v['name']) + '()'
- def __appendResource(self, rel, url, http_method, body_type, link,
response_type, resources={}, collectionsHolder={}, known_actions=[]):
+ def __appendResource(self, rel, url, http_method, body_type, link,
response_type,
+ resources={}, collectionsHolder={}, known_actions=[]):
'''appends to class_map (collectionsHolder) resource/method/action'''
i = 0
ln = len(resources)
#=========================================================
- #resources {'vms':xxx,'disks':yyy,'snapshots':zzz}
- #vms/xxx/disks/yyy/snapshots/zzz
+ # resources {'vms':xxx,'disks':yyy,'snapshots':zzz}
+ # vms/xxx/disks/yyy/snapshots/zzz
- #1.coll vms/None:1
- #2.res vms/xxx :1
- #3.sub-coll vms/xxx/disks/None :2
- #4.sub-res vms/xxx/disks/yyy :2
- #5.sub-sub-col vms/xxx/disks/yyy/snapshots/None :3
- #6.sub-sub-res vms/xxx/disks/yyy/snapshots/zzz :3
+ # 1.coll vms/None:1
+ # 2.res vms/xxx :1
+ # 3.sub-coll vms/xxx/disks/None :2
+ # 4.sub-res vms/xxx/disks/yyy :2
+ # 5.sub-sub-col vms/xxx/disks/yyy/snapshots/None :3
+ # 6.sub-sub-res vms/xxx/disks/yyy/snapshots/zzz :3
- #N.sub-sub-res vms/xxx/disks/yyy/snapshots/zzz/^N :3
+ # N.sub-sub-res vms/xxx/disks/yyy/snapshots/zzz/^N :3
- #num of permutations for N=K is K
- #num of pairs for N=K is k/2 (to differ between the res & coll
check the last pair val)
+ # num of permutations for N=K is K
+ # num of pairs for N=K is k/2 (to differ between the res & coll
check the last pair val)
root_coll = None
for k, v in resources.items():
i += 1
- if(ln is 1): #vms/xxx
- #coll = k
+ if(ln is 1): # vms/xxx
+ # coll = k
coll = ParseHelper.getXmlWrapperType(k)
if (v is None):
self.__extendCollection(coll, url, rel, http_method,
body_type, link, response_type, collectionsHolder)
else:
self.__extendResource(coll, url, rel, http_method,
body_type, link, response_type, collectionsHolder)
- elif(ln is 2): #vms/xxx/disks/yyy
- if (i is 1): #vms/xxx
- #root_coll = k
+ elif(ln is 2): # vms/xxx/disks/yyy
+ if (i is 1): # vms/xxx
+ # root_coll = k
root_coll = ParseHelper.getXmlWrapperType(k)
- if (i is 2): #disks/yyy
- #sub_coll = k
+ if (i is 2): # disks/yyy
+ # sub_coll = k
sub_coll = ParseHelper.getXmlWrapperType(k)
if (v is None and self.__isCollection(link)):
- self.__extendSubCollection(root_coll, sub_coll, url,
rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__extendSubCollection(root_coll, sub_coll, url,
rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
elif((v is None or v.find(':id') == -1) and http_method ==
'POST'):
if v is None:
- self.__createAction(root_coll, None, sub_coll,
url, rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__createAction(root_coll, None, sub_coll,
url, rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
else:
- self.__createAction(root_coll, sub_coll, v, url,
rel, http_method, body_type, link, response_type, collectionsHolder,
collection_action=True)
+ self.__createAction(root_coll, sub_coll, v, url,
rel, http_method,
+ body_type, link,
response_type, collectionsHolder, collection_action=True)
else:
- self.__extendSubResource(root_coll, sub_coll, url,
rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__extendSubResource(root_coll, sub_coll, url,
rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
elif(ln is 3):
if (i is 1):
root_coll = ParseHelper.getXmlWrapperType(k)
if (i is 2):
sub_coll = ParseHelper.getXmlWrapperType(k)
if (v is None and self.__isCollection(link)):
- self.__extendSubCollection(root_coll, sub_coll, url,
rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__extendSubCollection(root_coll, sub_coll, url,
rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
elif(v is None):
- self.__createAction(root_coll, None, sub_coll, url,
rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__createAction(root_coll, None, sub_coll, url,
rel, http_method,
+ body_type, link, response_type,
collectionsHolder)
else:
- self.__extendSubResource(root_coll, sub_coll, url,
rel, http_method, body_type, link, response_type, collectionsHolder,
extend_only=(ln > i))
+ self.__extendSubResource(root_coll, sub_coll, url,
rel, http_method,
+ body_type, link,
response_type, collectionsHolder, extend_only=(ln > i))
if (i is 3 and v is None and not self.__isCollection(link)):
- self.__createAction(root_coll, sub_coll, k, url, rel,
http_method, body_type, link, response_type, collectionsHolder)
+ self.__createAction(root_coll, sub_coll, k, url, rel,
http_method,
+ body_type, link, response_type,
collectionsHolder)
elif(i is 3):
sub_root_coll = self.__toSingular(root_coll) +
self.__toResourceType(sub_coll)
sub_res_coll = self.__toResourceType(resources.keys()[2])
if (v is None and self.__isCollection(link)):
- self.__extendSubCollection(sub_root_coll,
sub_res_coll, url, rel, http_method, body_type, link, response_type,
collectionsHolder)
+ self.__extendSubCollection(sub_root_coll,
sub_res_coll, url, rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
elif(self.__isAction(link)):
- self.__createAction(sub_root_coll, None, sub_coll,
url, rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__createAction(sub_root_coll, None, sub_coll,
url, rel, http_method,
+ body_type, link, response_type,
collectionsHolder)
else:
- self.__extendSubResource(sub_root_coll, sub_res_coll,
url, rel, http_method, body_type, link, response_type, collectionsHolder)
+ self.__extendSubResource(sub_root_coll, sub_res_coll,
url, rel, http_method,
+ body_type, link,
response_type, collectionsHolder)
elif(ln > 3):
- if(DEBUG): print 'WARNING: unsupported deep(' +
str(len(resources)) + "): url: " + url
+ print 'WARNING: unsupported deep(' + str(len(resources)) + "):
url: " + url
def __extendCollection(self, collection, url, rel, http_method, body_type,
link, response_type, collectionsHolder):
if (not collectionsHolder.has_key(collection)):
collection_body = Collection.collection(collection)
- collectionsHolder[collection] = {'body':collection_body,
- 'root_collection':True,
- 'name':collection}
+ collectionsHolder[collection] = {'body':collection_body,
'root_collection':True, 'name':collection}
- if(DEBUG): print '[root] creating collection: ' + collection + ',
for url: ' + url
- if(DEBUG): print '/n' + collection_body
-
- #['get', 'add', 'delete', 'update']
+ # ['get', 'add', 'delete', 'update']
if (rel == 'get'):
get_method = Collection.get(url, response_type, link,
KNOWN_WRAPPER_TYPES)
collectionsHolder[collection]['body'] += get_method
- if(DEBUG): print 'adding to collection: ' + collection + ', url: '
+ url + ', get() method:\n' + get_method
list_method = Collection.list(url, response_type, link,
KNOWN_WRAPPER_TYPES)
collectionsHolder[collection]['body'] += list_method
- if(DEBUG): print 'adding to collection: ' + collection + ', url: '
+ url + ', list() method:\n' + list_method
elif (rel == 'add'):
add_method = Collection.add(url, body_type, response_type, link,
KNOWN_WRAPPER_TYPES)
collectionsHolder[collection]['body'] += add_method
- if(DEBUG): print 'adding to collection: ' + collection + ', url: '
+ url + ', add() method:\n' + add_method
def __extendResource(self, collection, url, rel, http_method, body_type,
link, response_type, collectionsHolder):
resource = response_type if response_type is not None \
@@ -281,18 +269,14 @@
if (not collectionsHolder.has_key(resource)):
resource_body = Resource.resource(self.__toResourceType(resource),
[], KNOWN_WRAPPER_TYPES)
collectionsHolder[resource] = {'body':resource_body}
- if(DEBUG): print '[res] creating resource: ' + resource + ', at
collection: ' + collection + ', for url: ' + url
- if(DEBUG): print 'adding to resource: ' + resource + ' body:\n\n'
+ resource_body
- #['get', 'add', 'delete', 'update']
+ # ['get', 'add', 'delete', 'update']
if (rel == 'delete'):
del_method = Resource.delete(url, body_type, link, resource)
collectionsHolder[resource]['body'] += del_method
- if(DEBUG): print 'adding to resource: ' + resource + ' delete
method:\n\n' + del_method
elif (rel == 'update'):
upd_method = Resource.update(url, self.__toResourceType(resource),
link, KNOWN_WRAPPER_TYPES)
collectionsHolder[resource]['body'] += upd_method
- if(DEBUG): print 'adding to resource: ' +
self.__toResourceType(resource) + ' update method:\n\n' + upd_method
def __createAction(self, root_coll, sub_coll, action_name, url, rel,
http_method, body_type, link, response_type, collectionsHolder,
collection_action=False):
resource = root_coll[:len(root_coll) - 1]
@@ -304,8 +288,6 @@
self.__extendCollection(root_coll, url, rel, http_method,
body_type, link, response_type, collectionsHolder)
action_body = Resource.action(url, body_type, link, action_name,
resource, http_method, {})
collectionsHolder[resource]['body'] += action_body
- if(DEBUG): print '[act] creating action: ' + action_name + '() on
resource: ' + resource + ', for url: ' + url
- if(DEBUG): print '\n' + action_body
else:
nested_collection = root_coll[:len(root_coll) - 1] + sub_coll
nested_resource = nested_collection[:len(nested_collection) - 1]
if not collection_action else nested_collection
@@ -319,10 +301,7 @@
action_body = SubResource.action(url, link, action_name, resource,
body_type, sub_resource, http_method, {}, collection_action)
collectionsHolder[nested_resource]['body'] += action_body
- if(DEBUG): print '[act] creating action: ' + action_name + '() on
sub-resource: ' + nested_resource + ', for url: ' + url
- if(DEBUG): print '\n' + action_body
-
- #rename /preserved/ names
+ # rename /preserved/ names
def __adaptActionName(self, action_name, resource):
if action_name in PRESERVED_NAMES:
return action_name + '_' + resource.lower()
@@ -368,31 +347,25 @@
sub_coll_body = SubCollection.collection(sub_coll_type, root_res)
collectionsHolder[sub_coll_type] = {'body':sub_coll_body}
- if(DEBUG): print '[sub] creating sub-collection: ' + sub_coll_type
+ ', at resource: ' + root_res + ', for url: ' + url
- if(DEBUG): print '\n' + sub_coll_body
parentCache = self.__getParentCache(collectionsHolder, root_res,
KNOWN_WRAPPER_TYPES)
if parentCache is None:
- if(DEBUG): print 'failed locating cache for: %s, at url: %s \n' %
(root_res, url)
+ print 'failed locating cache for: %s, at url: %s \n' % (root_res,
url)
else:
- if(DEBUG): print 'add sub-coll %s, for: %s, at url: %s \n' %
(sub_coll_type, root_res, url)
if not parentCache.has_key('sub_collections'):
parentCache['sub_collections'] = {}
parentCache['sub_collections'][sub_coll.lower()] = (sub_coll_type)
- #['get', 'add']
+ # ['get', 'add']
if (rel == 'get'):
get_method_body = SubCollection.get(url, link, root_res,
self.__toResourceType(sub_res_type), sub_res, KNOWN_WRAPPER_TYPES,
NAMING_ENTITY_EXCEPTIONS)
collectionsHolder[sub_coll_type]['body'] += get_method_body
- if(DEBUG): print 'adding to sub-collection: ' + sub_coll_type + ',
url: ' + url + ', get() method:\n' + get_method_body
list_method = SubCollection.list(url, link, root_res,
self.__toResourceType(sub_res_type), sub_res, KNOWN_WRAPPER_TYPES,
NAMING_ENTITY_EXCEPTIONS)
collectionsHolder[sub_coll_type]['body'] += list_method
- if(DEBUG): print 'adding to sub-collection: ' + sub_coll_type + ',
url: ' + url + ', list() method:\n' + list_method
elif (rel == 'add'):
add_method = SubCollection.add(url, link, body_type, root_res,
self.__toResourceType(sub_res_type), KNOWN_WRAPPER_TYPES)
collectionsHolder[sub_coll_type]['body'] += add_method
- if(DEBUG): print 'adding to sub-collection: ' + sub_coll_type + ',
url: ' + url + ', add() method:\n' + add_method
def __extendSubResource(self, root_coll, sub_coll, url, rel, http_method,
body_type, link, response_type, collectionsHolder, extend_only=False):
root_res = self.__toSingular(root_coll)
@@ -402,38 +375,34 @@
if (not collectionsHolder.has_key(sub_res_type)):
sub_resource_body = SubResource.resource(sub_res_type,
self.__toResourceType(sub_res), root_res, KNOWN_WRAPPER_TYPES)
collectionsHolder[sub_res_type] = {'body':sub_resource_body}
- if(DEBUG): print '[sub-res] creating sub-resource: ' +
sub_res_type + ', with parent: ' + root_res + ', for url: ' + url
- if(DEBUG): print sub_resource_body
if not extend_only:
- #['delete', 'update']
+ # ['delete', 'update']
if (rel == 'delete'):
del_method = SubResource.delete(url, link, root_res, sub_res,
body_type)
collectionsHolder[sub_res_type]['body'] += del_method
- if(DEBUG): print 'adding to sub-resource: ' + sub_res_type + '
delete() method:\n\n' + del_method
elif (rel == 'update'):
update_method = SubResource.update(url, link, root_res,
self.__toResourceType(sub_res), sub_res_type, KNOWN_WRAPPER_TYPES)
collectionsHolder[sub_res_type]['body'] += update_method
- if(DEBUG): print 'adding to sub-resource: ' + sub_res_type + '
update() method:\n\n' + update_method
def __checkIfTooDeep(self, splitted_url, rel, url, http_method):
'''check for exceptions from known pattern'''
dlen = len(splitted_url)
- if (dlen > 4 and (dlen % 2 is 0)):#and rel is not in ['get']):
- if(DEBUG): print 'WARNING: found deep dependency (' + str(dlen) +
'): ' + 'rel: ' + rel + ', url: ' + url + ', method: ' + http_method + ', for
url: ' + url
+ if (dlen > 4 and (dlen % 2 is 0)): # and rel is not in ['get']):
+ print 'WARNING: found deep dependency (' + str(dlen) + '): ' +
'rel: ' + rel + ', url: ' + url + ', method: ' + http_method + ', for url: ' +
url
- def __do_request(self, method, url, body=None, headers={}):
+ def __doRequest(self, method, url, body=None, headers={}):
self.__conn.doRequest(method=method, url=url, body=body,
headers=headers)
response = self.__conn.getResponse()
if response.status >= 400:
raise RequestError, response
return response.read()
- def generate_python_bindings(self):
+ def generateSchemaBindings(self):
context.manager[self.context].add('filter', False)
- schema = self.__do_request(method='GET', url='/api?schema')
+ schema = self.__doRequest(method='GET', url='/api?schema')
with open(SCHEMA_FILE, 'w') as f:
f.write('%s' % schema)
paramsHandle(SCHEMA_FILE, XML_PARAMS_FILE, XML_PARAMS_TMP_FILE)
@@ -444,9 +413,9 @@
codegen = CodeGen()
# generate python2xml bindings
- codegen.generate_python_bindings()
+ codegen.generateSchemaBindings()
- #import modules required for generate_code()
+ # import modules required for generate()
from ovirtsdk.xml import params
from ovirtsdk.utils.parsehelper import ParseHelper
from codegen.collection.collection import Collection
@@ -457,4 +426,4 @@
KNOWN_WRAPPER_TYPES = ReflectionHelper.getClassNames(params)
# generate resources brokers
- codegen.generate_code()
+ codegen.generate()
--
To view, visit http://gerrit.ovirt.org/12482
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d10588d325ad3b0249988a1252dbf529267b527
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-sdk
Gerrit-Branch: sdk_3.2
Gerrit-Owner: Michael Pasternak <mpast...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
