Changeset b9c0090 for axis/Create.java

Timestamp:

Apr 8, 2011 2:32:11 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

a218fe2

Parents:

e2d324a

Message:

Parses topdl to the point where it will successfully create.

File:

• axis/Create.java (modified) (6 diffs)

axis/Create.java

@@ -5 +5 @@
 import edu.isi.www.fedd_types.*;
 import edu.isi.www.fedd_wsdl.*;
+
+// Topdl classes
+import edu.isi.www.topdl.*;
 
 // The fault thrown by failed commands
@@ -41 +44 @@
 
     /**
+     * Reads a topology file as topdl.  If this fails, just return null as
+     * later code will read the file as tcl.
+     * @param f The file to read
+     * @return the TopologyType encoded, or null of unparsable/unreadable
+     * @throws IOException if the file cannot be read
+     */
+    static public TopologyType readTopdl(File f) throws IOException {
+        try {
+            ParseTopdl p = new ParseTopdl(new FileInputStream(f), "experiment");
+            return p.getTopology();
+        }
+        catch (IOException e) { throw e; }
+        catch (Exception e) { return null; }
+    }
+
+    /**
      * Create an ABAC credential indicating the the given destination acts for
      * the given Identity, and attach a certificate to it.
+     * For some reason, the parse doesn't fail silently - something in the
+     * bowels of the XML parser prints an error.  Sigh.
      * @param id the Identity delegating authority
      * @param dest the destination
@@ -70 +91 @@
         // Parse out the args
         String exptName = "test";
-        String tclFile = "./deter-only.tcl";
+        String topoFileName = "./deter-only.tcl";
         String certFile = "./emulab.pem";
         String urlString = "https://users.isi.deterlab.net:23235";
 
         if (args.length > 0) exptName = args[0];
-        if (args.length > 1) tclFile = args[1];
+        if (args.length > 1) topoFileName = args[1];
         if (args.length > 2) certFile = args[2];
         if (args.length > 3) urlString = args[3];
@@ -83 +104 @@
          */
         FeddPortType port = getPort(urlString);
+        File topoFile = new File(topoFileName);
         Identity AbacID = null;
         byte[] nsContents = null;
-        try {
-            nsContents = readNsFile(new File(tclFile));
+        TopologyType topo = null;
+
+        try {
+
+            if ( (topo = readTopdl(topoFile)) == null) 
+                nsContents = readNsFile(topoFile);
+
+        }
+        catch (IOException e) {
+            System.err.println("Cannot load topology file " + e);
+            System.exit(20);
+        }
+
+        try {
             AbacID = new Identity(new File(certFile));
         }
@@ -96 +130 @@
         }
         catch (IOException e) {
-            System.err.println("Cannot load file " + e);
+            System.err.println("Cannot load ABAC id from " + 
+                    certFile + ": " + e);
             System.exit(20);
         }
@@ -122 +157 @@
 
         CreateRequestType createReq = new CreateRequestType(null, 
-                new ExperimentDescriptionType(nsContents, null),
+                new ExperimentDescriptionType(nsContents, topo),
                 null,
                 new IDType(null, null, null, newLabels.getLocalname(), null),