get rid of the underscores in slice_deployments and user_deployments in REST API

[plstackapi.git] / planetstack / apigen / modelgen

diff --git a/planetstack/apigen/modelgen b/planetstack/apigen/modelgen
old mode 100755 (executable)
new mode 100644 (file)
index e0def4b..8a647b1
--- a/planetstack/apigen/modelgen
+++ b/planetstack/apigen/modelgen
@@ -2,6 +2,7 @@
 
 import os
 import pdb
+import copy
 import sys
 import json
 import re
@@ -42,13 +43,35 @@ class GenObj(object):
                self.model = m
                self.props = []
                self.refs = []
+               self.plural_name = None
 
        def plural(self):
-               name = str(self)
-               if (name.endswith('s')):
-                       return name+'es'
+               if (self.plural_name):
+                       return self.plural_name
                else:
-                       return name+'s'
+                       name = str(self)
+                       if (name.endswith('s')):
+                               return name+'es'
+                       else:
+                               return name+'s'
+
+        def singular(self):
+            return str(self)
+
+        def rest_name(self):
+            # These are things that either for historic reasons or due to incorrect naming,
+            # got called something different than the autogen thinks they should be
+            # called.
+            REST_FIXUP = {'networkdeploymentses': 'networkdeployments',
+                            'imagedeploymentses': 'imagedeployments',
+                            'slicedeploymentses': 'slicedeployments',
+                            'userdeploymentses': 'userdeployments',
+                            'sitedeploymentses': 'sitedeployments',
+                            'siteroles': 'site_roles',
+                            'sliceprivileges': 'slice_privileges',
+                            'sliceroles': 'slice_roles',
+                            }
+            return REST_FIXUP.get(self.plural(), self.plural())
 
        def camel(self):
                name = str(self.model.__name__)
@@ -69,15 +92,31 @@ class Generator(dict):
 
        def compute_links(self):
                for obj in self.values():
-                       if (str(obj).lower()=='user'):
-                               pdb.set_trace()
+                       #if (str(obj)=='network'):
+                       #       pdb.set_trace()
                        fields = obj.model._meta.fields
                        for f in fields:
-                               if type(f)==ForeignKey and f.name in self.keys():
-                                       refobj = self[f.name]
-                                       obj.refs.append(refobj)
+                               if (f and f.rel):
+                                       to_name = str(f.rel.to)
+                               else:
+                                       to_name = None
+
+                               if type(f)==ForeignKey and to_name and to_name in self.keys():
+                                       refobj = self[f.to_name]
+
+                                       if (str(obj)=='slice' and f.to_name=='networks'):
+                                               obj.refs.append(refobj)
+                                       related_name = f.related_query_name()
+                                       if (related_name!='+' and related_name.lower()!=str(obj).lower()):
+                                               cobj = copy.deepcopy(obj)
+                                               cobj.multi = True
+                                               cobj.plural_name = related_name
+                                               #if (str(refobj)=='slice' and related_name=='networks'):
+                                               #       pdb.set_trace()
+                                               refobj.refs.append(cobj)
                                else:
                                        obj.props.append(f.name)
+
                        m2m = obj.model._meta.many_to_many
                        for f in m2m:
                                try:
@@ -85,10 +124,32 @@ class Generator(dict):
                                except:
                                        related_model_name = f.m2m_db_table().rsplit('_',1)[-1]
 
+                               related_name = f.related_query_name()
                                if related_model_name in self.keys():
+                       #               pdb.set_trace()
                                        refobj = self[related_model_name]
-                                       obj.multi=True
-                                       refobj.refs.append(obj)
+                                       cobj = copy.deepcopy(obj)
+                                       cobj.multi=True
+                                       refobj.refs.append(cobj)
+
+                                # deal with upgradeFrom_rel_+
+                                if (related_name.endswith("+")):
+                                    continue
+
+                               if (related_name!='+' and related_name.lower()!=str(obj).lower()):
+                                       cobj = copy.deepcopy(obj)
+                                       cobj.multi = True
+                                       cobj.plural_name = related_name
+
+                                       #if (str(refobj)=='slice' and related_name=='networks'):
+                                       #       pdb.set_trace()
+                                       refobj.refs.append(cobj)
+
+                                       #if (related_name=='networks'):
+                                               #pdb.set_trace()
+                                               #print str(refobj)
+
+
 
                        
 def main():