Changeset 5bbad0849d0e3e3c2e87ee597cde5fe000a6f031

Timestamp:

01/12/12 19:42:13 (4 months ago)

Author:

Ted Faber <faber@…>

Children:

6bedbdba95fa86da37dcd0fca8e04160480215bf

Parents:

cfc4d68cb4e45963ff15d3552f527f4c420f6978

git-committer:

Ted Faber <faber@isi.edu> / 2012-01-12T19:42:13Z-0800

Message:

Accomodate new info format

Location:

axis

Files:

• Ftopo.java (modified) (3 diffs)
• ParseTopdl.java (modified) (18 diffs)

axis/Ftopo.java

@@ -20 +20 @@
             java.rmi.RemoteException {
 
+        String exptName = "test";
+        String urlString = "https://users.isi.deterlab.net:23235";
+
+        if (args.length > 0) exptName = args[0];
+        if (args.length > 1) urlString = args[1];
+
         // Get the port and construct the (simple) request.
-        FeddPortType port = getPort("https://users.isi.deterlab.net:23235");
+        FeddPortType port = getPort(urlString);
         InfoRequestType req = new InfoRequestType(
-                new IDType(null, null, null, args[0], null));
+                new IDType(null, null, null, exptName, null), true, true);
         InfoResponseType resp = null;
-        Map<String, List<EmbeddingMapType> > tbNodes = 
-            new TreeMap<String, List<EmbeddingMapType>>();
         VtopoType vt = null;
         TopologyType top = null;
@@ -45 +49 @@
         }
 
-        // Put each embedding mapping (object containing embedding info) into a
-        // List keyed by testbed.
-        System.out.println("From embedding:");
-        for (EmbeddingMapType m: resp.getEmbedding()) {
-            List<EmbeddingMapType> al = null;
 
-            if (tbNodes.containsKey(m.getTestbed())) {
-                al = tbNodes.get(m.getTestbed());
-            }
-            else {
-                al = new ArrayList<EmbeddingMapType>();
-                tbNodes.put(m.getTestbed(), al);
-            }
-            al.add(m);
-        }
-
-        for (String tb: tbNodes.keySet()) {
-            System.out.println("Testbed: " + tb);
-            for ( EmbeddingMapType m : tbNodes.get(tb)) {
-                System.out.print("\t" + m.getToponame() + " ");
-                for ( String pn : m.getPhysname())
-                    System.out.print(pn + " " );
-                System.out.println();
-            }
-            System.out.println();
-        }
-        System.out.println();
-
-        // There's a topdl description in there, too
+        // Walk the topdl description
         top = resp.getExperimentdescription().getTopdldescription();
         if ( top == null ) { 
@@ -85 +62 @@
             if ( c != null) {
                 System.out.println("\t" + c.getName());
+                for (String name : c.getLocalname()) 
+                    System.out.println("\t\t" + name);
                 for (AttributeType a: c.getAttribute()) 
                     System.out.println("\t\t" + a.getAttribute() + " " +

axis/ParseTopdl.java

@@ -23 +23 @@
      * parser at 3 places: when an XML element starts (<element>) when
      * one ends (<element/>) and whenever characters inside an element
-     * are encountered.  It mostly initializes fileds as elements are exited,
+     * are encountered.  It mostly initializes fields as elements are exited,
      * collecting other parsed fields into objects that are finally attached to
      * the topology itself.
@@ -48 +48 @@
         /** the most recent name element parsed */
         protected String name;
+        // Many statuses as well
+        protected StatusType status;
 
         // CPU parameters
@@ -62 +64 @@
         /** Current OS distro version */
         protected String distributionversion;
+        /** Local names of this node */
+        protected Vector<String> localnames;
+
+        /** True if in a Computer testbed or substrate that has local names */
+        protected boolean collectLocalnames;
+
 
         // Software parameters
@@ -68 +76 @@
         /** Current software location */
         protected String location;
+
+        // Service Parameters
+        protected Vector<String> importers;
+        protected Vector<ServiceParamType> serviceParams;
+        protected String description;
+
+        //ServiceParam parameters
+        protected String serviceParamName;
+        protected ServiceParamTypeType serviceParamType;
 
         // Storage parameters
@@ -136 +153 @@
         /** Interfaces seen so far */
         protected Vector<InterfaceType> interfaces;
+        /** Services seen so far */
+        protected Vector<ServiceType> services;
+        /** Operations seen so far */
+        protected Vector<String> operations;
 
         /**
@@ -157 +178 @@
          */
         protected Stack<String> nameStack;
+        /**
+         * Analogous to attrStack for status
+         */
+        protected Stack<StatusType> statusStack;
+        /**
+         * Analogous to attrElements for names.
+         */
+        protected Set<String> statusElements;
+        /**
+         * These elements collect localnames
+         */
+        protected Set<String> localnameElements;
         /**
          * The current buffer of characters collected.
@@ -183 +216 @@
             other = null;
 
+            localnames = new Vector<String>();
+            collectLocalnames = false;
+
             type = null;
             name = null;
@@ -188 +224 @@
 
             version = distribution = distributionversion = null;
+            description = null;
 
             install = location = null;
@@ -212 +249 @@
 
             aname = aval = null;
+            importers = new Vector<String>();;
+            serviceParams = new Vector<ServiceParamType>();
 
             elements = new Vector<ElementType>();
@@ -220 +259 @@
             storage = new Vector<StorageType>();
             interfaces = new Vector<InterfaceType>();
+            services = new Vector<ServiceType>();
+            serviceParams = new Vector<ServiceParamType>();
             attrs = new Vector<AttributeType>();
+            operations = new Vector<String>();
 
             attrElements = new TreeSet<String>();
@@ -232 +274 @@
             nameElements = new TreeSet<String>();
             for (String e : new String[] {
-                "computer", "os", "interface", "substrates" 
+                "computer", "os", "interface", "substrates", "service",
+                "param"
             }) nameElements.add(e);
             nameStack = new Stack<String>();
+
+            statusElements = new TreeSet<String>();
+            for (String e : new String[] {
+                "computer", "testbed", "substrates", "service",
+            }) statusElements.add(e);
+            statusStack = new Stack<StatusType>();
+
+            localnameElements = new TreeSet<String>();
+            for (String e : new String[] {
+                "computer", "testbed", "substrates",
+            }) localnameElements.add(e);
             c = new char[0];
         }
@@ -265 +319 @@
                 nameStack.push(name);
                 name = null;
+            }
+            if ( statusElements.contains(qn) ) {
+                statusStack.push(status);
+                status = null;
+            }
+            if ( localnameElements.contains(qn) ) {
+                collectLocalnames = true;
             }
             if (qn.equals("id")) inID = true;
@@ -321 +382 @@
                         interfaces.toArray(
                             new InterfaceType[interfaces.size()]),
-                        attrs.toArray(new AttributeType[attrs.size()]));
+                        attrs.toArray(new AttributeType[attrs.size()]),
+                        localnames.toArray(new String[localnames.size()]),
+                        status,
+                        services.toArray(new ServiceType[services.size()]),
+                        operations.toArray(new String[operations.size()])
+                        );
                 name = nameStack.pop();
                 cpus = new Vector<CpuType>();
@@ -329 +395 @@
                 interfaces = new Vector<InterfaceType>();
                 attrs = attrStack.pop();
+                localnames = new Vector<String>();
+                status = statusStack.pop();
+                services = new Vector<ServiceType>();
+                operations = new Vector<String>();
+                collectLocalnames = false;
             }
             else if (qn.equals("cpu")) {
@@ -414 +485 @@
                         interfaces.toArray(
                             new InterfaceType[interfaces.size()]),
-                        attrs.toArray(new AttributeType[attrs.size()]));
+                        attrs.toArray(new AttributeType[attrs.size()]),
+                        localnames.toArray(new String[localnames.size()]),
+                        status,
+                        services.toArray(new ServiceType[services.size()]),
+                        operations.toArray(new String[operations.size()]));
                 uri = type = null;
                 interfaces = new Vector<InterfaceType>();
                 attrs = attrStack.pop();
+                localnames = new Vector<String>();
+                status = statusStack.pop();
+                services = new Vector<ServiceType>();
+                operations = new Vector<String>();
+                collectLocalnames = false;
             }
             else if (qn.equals("uri")) { 
@@ -450 +530 @@
             }
             else if (qn.equals("localname")) {
-                localname = new String(c).trim();
+                if (collectLocalnames) localnames.add(new String(c).trim());
+                else localname = new String(c).trim();
             }
             else if (qn.equals("kerberosUsername")) { 
                 kerberosUsername = new String(c).trim();
+            }
+            else if (qn.equals("description")) { 
+                description = new String(c).trim();
             }
             else if (qn.equals("other")) { 
@@ -465 +549 @@
             else if (qn.equals("substrates")) {
                 subs.add(new SubstrateType(name, cap, lat, 
-                        attrs.toArray(new AttributeType[attrs.size()])));
+                        attrs.toArray(new AttributeType[attrs.size()]),
+                        localnames.toArray(new String[localnames.size()]),
+                        status,
+                        services.toArray(new ServiceType[services.size()]),
+                        operations.toArray(new String[operations.size()])
+                        ));
                 name = nameStack.pop();
                 cap = null;
                 lat = null;
                 attrs = attrStack.pop();
+                localnames = new Vector<String>();
+                status = statusStack.pop();
+                services = new Vector<ServiceType>();
+                operations = new Vector<String>();
+                collectLocalnames = false;
             }
             else if (qn.equals("attribute")) {
@@ -480 +574 @@
             else if ( qn.equals("value")) { aval = new String(c).trim(); }
             else if ( qn.equals("name")) { name = new String(c).trim(); }
+            else if ( qn.equals("param") ) {
+                serviceParams.add(new ServiceParamType(name, 
+                            ServiceParamTypeType.fromString(type)));
+                name = nameStack.pop();
+                type = null;
+            }
+            else if (qn.equals("service")) {
+                services.add(new ServiceType(
+                        name, importers.toArray(new String[importers.size()]),
+                        serviceParams.toArray(
+                            new ServiceParamType[serviceParams.size()]),
+                        description, status));
+                name = nameStack.pop();
+                importers = new Vector<String>();
+                serviceParams = new Vector<ServiceParamType>();
+                description = null;
+                status = statusStack.pop();
+            }
 
             // Always clear any accumulated characters