Changeset 43197eb for fedd/federation/protogeni_access.py

Timestamp:

Apr 16, 2010 8:16:22 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

4f2f41f

Parents:

0c4b12c

Message:

better service handling including project_export psuedo service done more or less right- tested on dry runs

File:

• fedd/federation/protogeni_access.py (modified) (2 diffs)

fedd/federation/protogeni_access.py

@@ -455 +455 @@
 
 
+    def export_SMB(self, id, state, project, user):
+        return { 
+                'id': id,
+                'name': 'SMB',
+                'visibility': 'export',
+                'server': 'http://fs:139',
+                'fedAttr': [
+                        { 'attribute': 'SMBSHARE', 'value': 'USERS' },
+                        { 'attribute': 'SMBUSER', 'value': user },
+                        { 'attribute': 'SMBPROJ', 'value': project },
+                    ]
+                }
+
+    def export_seer(self, id, state, project, user):
+        return { 
+                'id': id,
+                'name': 'seer',
+                'visibility': 'export',
+                'server': 'http://control:16606',
+                }
+
+    def export_tmcd(self, id, state, project, user):
+        return { 
+                'id': id,
+                'name': 'seer',
+                'visibility': 'export',
+                'server': 'http://boss:7777',
+                }
+
+    def export_userconfig(self, id, state, project, user):
+        if self.userconfdir and self.userconfcmd \
+                and self.userconfurl:
+            cid, cert = self.export_userconf(project)
+            state['userconfig'] = unicode(cid)
+            return {
+                    'id': id,
+                    'name': 'userconfig',
+                    'visibility': 'export',
+                    'server': "%s/%s" % (self.userconfurl, str(cid)),
+                    'fedAttr': [
+                        { 'attribute': 'cert', 'value': cert },
+                    ]
+                    }
+        else:
+            return None
+
     def export_services(self, sreq, project, user):
         exp = [ ]
@@ -465 +511 @@
             if svis == 'export':
                 if sname in self.exports:
-                    outs = s.copy()
+                    id = s.get('id', 'no_id')
                     if sname == 'SMB':
-                        outs = s.copy()
-                        outs['server'] = "http://fs:139" 
-                        outs['fedAttr'] = [
-                                { 'attribute': 'SMBSHARE', 'value': 'USERS' },
-                                { 'attribute': 'SMBUSER', 'value': user },
-                                { 'attribute': 'SMBPROJ', 'value': project },
-                            ]
+                        exp.append(self.export_SMB(id, state, project, user))
                     elif sname == 'seer':
-                        outs['server'] = "http://control:16606"
+                        exp.append(self.export_seer(id, state, project, user))
                     elif sname == 'tmcd':
-                        outs['server'] = "http://boss:7777"
+                        exp.append(self.export_tmcd(id, state, project, user))
                     elif sname == 'userconfig':
-                        if self.userconfdir and self.userconfcmd \
-                                and self.userconfurl:
-                            cid, cert = self.export_userconf(project)
-                            outs['server'] = "%s/%s" % \
-                                    (self.userconfurl, str(cid))
-                            outs['fedAttr'] = [
-                                    { 'attribute': 'cert', 'value': cert },
-                                ]
-                            state['userconfig'] = unicode(cid)
-                    exp.append(outs)
+                        exp.append(self.export_userconfig(id, state,
+                            project, user))
+                    elif sname == 'project_export':
+                        exp.append(self.export_SMB(id, state, project, user))
+                        exp.append(self.export_seer(id, state, project, user))
+                        exp.append(self.export_userconfig(id, state,
+                            project, user))
         return (exp, state)