Changeset abb87eb

Timestamp:

Oct 17, 2008 9:52:04 AM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4700b3b

Parents:

3925b50

Message:

split acces to service and experiment access

Location:

fedd

Files:

• fedd_access.py (modified) (1 diff)
• fedd_experiment_control.py (modified) (2 diffs)
• fedd_types.xsd (modified) (3 diffs)

fedd/fedd_access.py

@@ -435 +435 @@
                             "Access denied (nodetypes %s)" % \
                             str(', ').join(inaccessible))
-
-            ssh = [ x['sshPubkey'] \
-                    for x in req['access'] if x.has_key('sshPubkey')]
+            # XXX: This allocates a single user for both service and creation.
+            # This needs to be made more nuanced.
+            tmp_ssh = [ x['sshPubkey'] \
+                    for x in req['serviceAccess'] + req['createAccess'] \
+                        if x.has_key('sshPubkey')]
+
+            # Converting to a set collapses duplicates
+            ssh = set(tmp_ssh)
 
             if len(ssh) > 0: 

fedd/fedd_experiment_control.py

@@ -815 +815 @@
         }
 
-        # XXX multi-level access
         uri = self.tbmap.get(tb, None)
         if not uri:
@@ -826 +825 @@
                 'user':  user,
                 'allocID' : { 'localname': 'test' },
-                'access' : [ { 'sshPubkey' : self.ssh_pubkey } ]
+                # XXX: need to get service access stright
+                'createAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ],
+                'serviceAccess' : [ { 'sshPubkey' : self.ssh_pubkey } ]
             }
         

fedd/fedd_types.xsd

@@ -68 +68 @@
   </xsd:complexType>
 
+  <xsd:simpleType name="userRole">
+    <xsd:annotation>
+      <xsd:documentation>
+        Purpose of this user - service access or experiment creation
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="serviceAccess"/>
+      <xsd:enumeration value="experimentCreation"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+
   <xsd:complexType name="userType">
     <xsd:annotation>
@@ -80 +93 @@
       <xsd:element name="access" type="tns:accessType" minOccurs="0"
         maxOccurs="unbounded"/>
+      <xsd:element name="role" type="tns:userRole" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
   </xsd:complexType>
@@ -294 +308 @@
       <xsd:element name="resources" type="tns:resourcesType" minOccurs="0" 
         maxOccurs="1"/>
-      <xsd:element name="access" type="tns:accessType" minOccurs="1" 
+      <xsd:element name="createAccess" type="tns:accessType" minOccurs="1" 
+        maxOccurs="unbounded"/>
+      <xsd:element name="serviceAccess" type="tns:accessType" minOccurs="1" 
         maxOccurs="unbounded"/>
       <xsd:element name="allocID" type="tns:IDType"/>