Changeset 20cda34

Timestamp:

Nov 6, 2009 3:34:49 PM (14 years ago)

Author:

Jay Jacobs <Jay.Jacobs@…>

Branches:

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

Children:

2ed74c6

Parents:

3eefc2d

Message:

Added two-party functionality and example

Location:

fedd

Files:

• abac_client.py (modified) (3 diffs)
• abac_test.sh (modified) (1 diff)

fedd/abac_client.py

@@ -185 +185 @@
                 type="string",default="https://localhost:23235",  
                 help="URL to connect to (default %default)")
+        self.add_option("-n", "--ident", action="store", dest="id",
+                type="string",default="Alice",  
+                help="URL to connect to (default %default)")
         self.add_option("-F","--useFedid", action="store_true",
                 dest="use_fedid", default=False,
@@ -233 +236 @@
                 type="string",
                 help="Trust target goal for negotiation (required)")
+        self.add_option("--srcURL", action="store", dest="srcURL",
+                type="string",default="https://localhost:23235",  
+                help="Originating URL address (Default: %default)")
+        self.add_option("--dstURL", action="store", dest="dstURL",
+                type="string",default="https://localhost:23235",  
+                help="Peer URL address (Default: %default)")
+        self.add_option("--srcContext", action="store", dest="srcContext",
+                type="string",default="Alice",  
+                help="Service negotiation context (Default: %default)")
+        self.add_option("--dstContext", action="store", dest="dstContext",
+                type="string",default="Bob",  
+                help="Client call back negotiation context (Default: %default)")
+
         if add_node_callback:
             self.add_option("-n", "--node", action="callback", type="string", 
@@ -664 +680 @@
         msg = {
                 'context': { 'contextID': opts.id },
-                'goal': opts.goal
-                }
+                'goal': opts.goal,
+                'peerURL': opts.dstURL,
+                'peerContext' : { 'contextID': opts.dstContext },
+                'selfURL': opts.srcURL
+        }
 
         if opts.debug > 1: print >>sys.stderr, msg

fedd/abac_test.sh

@@ -4 +4 @@
 ./abac_client.py create --cert=emulab.pem --transport=soap \
         --trace \
-        --url=http://localhost:8443/axis/services/feddABACPort \
+        --url=http://localhost:8443/axis2/services/feddABACPort \
         --file=/usr/local/tomcat5.5/webapps/axis/WEB-INF/geni.txt
 # Run the negotiation with an access request
 ./abac_client.py access --cert=emulab.pem --transport=soap \
         --trace \
-        --url=http://localhost:8443/axis/services/feddABACPort \
-        --context_id=0 --goal='GENI:GENI.CTFaccess<<---Alice'
+        --url=http://localhost:8443/axis2/services/feddABACPort \
+        --context_id=0 --goal='GENI:GENI.CTFaccess<<---Alice' 
+# Test a two part negoitation
+./abac_client.py access --cert=emulab.pem --transport=soap \
+        --trace --url=http://localhost:8443/axis2/services/feddABACPort 
+        --context_id=0 --goal='GENI:GENI.CTFaccess<<---Alice' \
+        --srcURL=http://localhost:8443/axis2/services/feddABACPort \
+        --dstContext=1 \
+        --dstURL=http://localhost:8443/axis2/services/feddABACPort
+