Merge "Added extensible implementation of Transformators"
authorGiovanni Meo <gmeo@cisco.com>
Wed, 29 May 2013 14:30:08 +0000 (14:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 29 May 2013 14:30:08 +0000 (14:30 +0000)
opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIntegrationTest.java
opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/Activator.java
opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java [new file with mode: 0644]
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/Node.java
opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java [new file with mode: 0644]
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml

index 19c756a..4997e37 100644 (file)
@@ -98,58 +98,58 @@ public class NorthboundIntegrationTest {
     private String getJsonResult(String restUrl, String method) {
         // initialize response code to indicate error
         httpResponseCode = 400;
-        
+
         try {
-          URL url = new URL(restUrl);
-
-          this.users.getAuthorizationList();
-          this.users.authenticate("admin", "admin");
-          String authString = "admin:admin";
-          byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
-          String authStringEnc = new String(authEncBytes);
-          
-          HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-          connection.setRequestMethod(method);
-          connection.setRequestProperty("Authorization", "Basic "
-                  + authStringEnc);
-          connection.setRequestProperty("Content-Type", "application/json");
-          connection.setRequestProperty("Accept", "application/json");
-
-          connection.connect();
-          connection.getContentType();
-          
-          // Response code for success should be 2xx
-          httpResponseCode = connection.getResponseCode();
-          
-          InputStream is = connection.getInputStream();
-          BufferedReader rd = new BufferedReader(new InputStreamReader(is,
-                  Charset.forName("UTF-8")));
-          StringBuilder sb = new StringBuilder();
-          int cp;
-          while ((cp = rd.read()) != -1) {
-              sb.append((char) cp);
-          }
-          is.close();
-          connection.disconnect();
-          return sb.toString();
-      } catch (Exception e) {
-          return null;
-      }
-      
-  }
+            URL url = new URL(restUrl);
+
+            this.users.getAuthorizationList();
+            this.users.authenticate("admin", "admin");
+            String authString = "admin:admin";
+            byte[] authEncBytes = Base64.encodeBase64(authString.getBytes());
+            String authStringEnc = new String(authEncBytes);
+
+            HttpURLConnection connection = (HttpURLConnection) url
+                    .openConnection();
+            connection.setRequestMethod(method);
+            connection.setRequestProperty("Authorization", "Basic "
+                    + authStringEnc);
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setRequestProperty("Accept", "application/json");
+
+            connection.connect();
+            connection.getContentType();
+
+            // Response code for success should be 2xx
+            httpResponseCode = connection.getResponseCode();
+
+            InputStream is = connection.getInputStream();
+            BufferedReader rd = new BufferedReader(new InputStreamReader(is,
+                    Charset.forName("UTF-8")));
+            StringBuilder sb = new StringBuilder();
+            int cp;
+            while ((cp = rd.read()) != -1) {
+                sb.append((char) cp);
+            }
+            is.close();
+            connection.disconnect();
+            return sb.toString();
+        } catch (Exception e) {
+            return null;
+        }
+
+    }
 
     @Test
     public void testStatistics() {
-
+        String actionTypes[] = { "drop", "loopback", "flood", "floodAll",
+                "controller", "swPath", "hwPath", "output", "setDlSrc",
+                "setDlDst", "setDlType", "setVlanId", "setVlanPcp",
+                "setVlanCfi", "popVlan", "pushVlan", "setNwSrc", "setNwDst",
+                "setNwTos", "setTpSrc", "setTpDst" };
         System.out.println("Starting Statistics JAXB client.");
 
         String baseURL = "http://127.0.0.1:8080/controller/nb/v2/statistics/default/";
         try {
-            String actionTypes[] = { "drop", "loopback", "flood", "floodAll",
-                    "controller", "swPath", "hwPath", "output", "setDlSrc",
-                    "setDlDst", "setDlType", "setVlanId", "setVlanPcp",
-                    "setVlanCfi", "popVlan", "pushVlan", "setNwSrc",
-                    "setNwDst", "setNwTos", "setTpSrc", "setTpDst" };
             String result = getJsonResult(baseURL + "flowstats");
             JSONTokener jt = new JSONTokener(result);
             JSONObject json = new JSONObject(jt);
@@ -164,96 +164,8 @@ public class NorthboundIntegrationTest {
             for (int i = 0; i < flowStats.length(); i++) {
 
                 JSONObject flowStat = flowStats.getJSONObject(i);
-                Assert.assertTrue(flowStat.getInt("tableId") == 1);
-                Assert.assertTrue(flowStat.getInt("durationSeconds") == 40);
-                Assert.assertTrue(flowStat.getInt("durationNanoseconds") == 400);
-                Assert.assertTrue(flowStat.getInt("packetCount") == 200);
-                Assert.assertTrue(flowStat.getInt("byteCount") == 100);
-
-                // test that flow information is correct
-                JSONObject flow = flowStat.getJSONObject("flow");
-                Assert.assertTrue(flow.getInt("priority") == 3500);
-                Assert.assertTrue(flow.getInt("idleTimeout") == 1000);
-                Assert.assertTrue(flow.getInt("hardTimeout") == 2000);
-                Assert.assertTrue(flow.getInt("id") == 12345);
-
-                JSONObject match = (flow.getJSONObject("match")
-                        .getJSONObject("matchField"));
-                Assert.assertTrue(match.getString("type").equals("NW_DST"));
-                Assert.assertTrue(match.getString("value").equals("1.1.1.1"));
-
-                JSONObject act = flow.getJSONObject("actions");
-                Assert.assertTrue(act.getString("@type").equals(actionTypes[i]));
-
-                if (act.getString("@type").equals("output")) {
-                    JSONObject port = act.getJSONObject("port");
-                    JSONObject port_node = port.getJSONObject("node");
-                    Assert.assertTrue(port.getInt("@id") == 51966);
-                    Assert.assertTrue(port.getString("@type").equals("STUB"));
-                    Assert.assertTrue(port_node.getInt("@id") == 51966);
-                    Assert.assertTrue(port_node.getString("@type").equals(
-                            "STUB"));
-                }
-
-                if (act.getString("@type").equals("setDlSrc")) {
-                    byte srcMatch[] = { (byte) 5, (byte) 4, (byte) 3, (byte) 2,
-                            (byte) 1 };
-                    String src = act.getString("address");
-                    byte srcBytes[] = new byte[5];
-                    srcBytes[0] = Byte.parseByte(src.substring(0, 2));
-                    srcBytes[1] = Byte.parseByte(src.substring(2, 4));
-                    srcBytes[2] = Byte.parseByte(src.substring(4, 6));
-                    srcBytes[3] = Byte.parseByte(src.substring(6, 8));
-                    srcBytes[4] = Byte.parseByte(src.substring(8, 10));
-                    Assert.assertTrue(Arrays.equals(srcBytes, srcMatch));
-                }
-
-                if (act.getString("@type").equals("setDlDst")) {
-                    byte dstMatch[] = { (byte) 1, (byte) 2, (byte) 3, (byte) 4,
-                            (byte) 5 };
-                    String dst = act.getString("address");
-                    byte dstBytes[] = new byte[5];
-                    dstBytes[0] = Byte.parseByte(dst.substring(0, 2));
-                    dstBytes[1] = Byte.parseByte(dst.substring(2, 4));
-                    dstBytes[2] = Byte.parseByte(dst.substring(4, 6));
-                    dstBytes[3] = Byte.parseByte(dst.substring(6, 8));
-                    dstBytes[4] = Byte.parseByte(dst.substring(8, 10));
-                    Assert.assertTrue(Arrays.equals(dstBytes, dstMatch));
-                }
-                if (act.getString("@type").equals("setDlType"))
-                    Assert.assertTrue(act.getInt("dlType") == 10);
-                if (act.getString("@type").equals("setVlanId"))
-                    Assert.assertTrue(act.getInt("vlanId") == 2);
-                if (act.getString("@type").equals("setVlanPcp"))
-                    Assert.assertTrue(act.getInt("pcp") == 3);
-                if (act.getString("@type").equals("setVlanCfi"))
-                    Assert.assertTrue(act.getInt("cfi") == 1);
-
-                if (act.getString("@type").equals("setNwSrc"))
-                    Assert.assertTrue(act.getString("address")
-                            .equals("2.2.2.2"));
-                if (act.getString("@type").equals("setNwDst"))
-                    Assert.assertTrue(act.getString("address")
-                            .equals("1.1.1.1"));
-
-                if (act.getString("@type").equals("pushVlan")) {
-                    int head = act.getInt("VlanHeader");
-                    // parsing vlan header
-                    int id = head & 0xfff;
-                    int cfi = (head >> 12) & 0x1;
-                    int pcp = (head >> 13) & 0x7;
-                    int tag = (head >> 16) & 0xffff;
-                    Assert.assertTrue(id == 1234);
-                    Assert.assertTrue(cfi == 1);
-                    Assert.assertTrue(pcp == 1);
-                    Assert.assertTrue(tag == 0x8100);
-                }
-                if (act.getString("@type").equals("setNwTos"))
-                    Assert.assertTrue(act.getInt("tos") == 16);
-                if (act.getString("@type").equals("setTpSrc"))
-                    Assert.assertTrue(act.getInt("port") == 4201);
-                if (act.getString("@type").equals("setTpDst"))
-                    Assert.assertTrue(act.getInt("port") == 8080);
+                testFlowStat(flowStat, actionTypes[i]);
+
             }
 
             // for /controller/nb/v2/statistics/default/portstats
@@ -281,8 +193,44 @@ public class NorthboundIntegrationTest {
             Assert.assertTrue(portStat.getInt("receiveCrcError") == 1);
             Assert.assertTrue(portStat.getInt("collisionCount") == 4);
 
-            // String result = getJsonResult(baseURL+"flowstats/STUB/51966");
-            // System.out.println(result);
+            // test for getting one specific node's stats
+            result = getJsonResult(baseURL + "flowstats/STUB/51966");
+            jt = new JSONTokener(result);
+            json = new JSONObject(jt);
+            node = json.getJSONObject("node");
+            // test that node was returned properly
+            Assert.assertTrue(node.getInt("@id") == 0xCAFE);
+            Assert.assertTrue(node.getString("@type").equals("STUB"));
+
+            // test that flow statistics results are correct
+            flowStats = json.getJSONArray("flowStat");
+            for (int i = 0; i < flowStats.length(); i++) {
+                JSONObject flowStat = flowStats.getJSONObject(i);
+                testFlowStat(flowStat, actionTypes[i]);
+            }
+
+            result = getJsonResult(baseURL + "portstats/STUB/51966");
+            jt = new JSONTokener(result);
+            json = new JSONObject(jt);
+            node2 = json.getJSONObject("node");
+            // test that node was returned properly
+            Assert.assertTrue(node2.getInt("@id") == 0xCAFE);
+            Assert.assertTrue(node2.getString("@type").equals("STUB"));
+
+            // test that port statistic results are correct
+            portStat = json.getJSONObject("portStat");
+            Assert.assertTrue(portStat.getInt("receivePackets") == 250);
+            Assert.assertTrue(portStat.getInt("transmitPackets") == 500);
+            Assert.assertTrue(portStat.getInt("receiveBytes") == 1000);
+            Assert.assertTrue(portStat.getInt("transmitBytes") == 5000);
+            Assert.assertTrue(portStat.getInt("receiveDrops") == 2);
+            Assert.assertTrue(portStat.getInt("transmitDrops") == 50);
+            Assert.assertTrue(portStat.getInt("receiveErrors") == 3);
+            Assert.assertTrue(portStat.getInt("transmitErrors") == 10);
+            Assert.assertTrue(portStat.getInt("receiveFrameError") == 5);
+            Assert.assertTrue(portStat.getInt("receiveOverRunError") == 6);
+            Assert.assertTrue(portStat.getInt("receiveCrcError") == 1);
+            Assert.assertTrue(portStat.getInt("collisionCount") == 4);
 
         } catch (Exception e) {
             // Got an unexpected exception
@@ -291,6 +239,100 @@ public class NorthboundIntegrationTest {
         }
     }
 
+    private void testFlowStat(JSONObject flowStat, String actionType) {
+        try {
+            Assert.assertTrue(flowStat.getInt("tableId") == 1);
+            Assert.assertTrue(flowStat.getInt("durationSeconds") == 40);
+            Assert.assertTrue(flowStat.getInt("durationNanoseconds") == 400);
+            Assert.assertTrue(flowStat.getInt("packetCount") == 200);
+            Assert.assertTrue(flowStat.getInt("byteCount") == 100);
+
+            // test that flow information is correct
+            JSONObject flow = flowStat.getJSONObject("flow");
+            Assert.assertTrue(flow.getInt("priority") == 3500);
+            Assert.assertTrue(flow.getInt("idleTimeout") == 1000);
+            Assert.assertTrue(flow.getInt("hardTimeout") == 2000);
+            Assert.assertTrue(flow.getInt("id") == 12345);
+
+            JSONObject match = (flow.getJSONObject("match")
+                    .getJSONObject("matchField"));
+            Assert.assertTrue(match.getString("type").equals("NW_DST"));
+            Assert.assertTrue(match.getString("value").equals("1.1.1.1"));
+
+            JSONObject act = flow.getJSONObject("actions");
+            Assert.assertTrue(act.getString("@type").equals(actionType));
+
+            if (act.getString("@type").equals("output")) {
+                JSONObject port = act.getJSONObject("port");
+                JSONObject port_node = port.getJSONObject("node");
+                Assert.assertTrue(port.getInt("@id") == 51966);
+                Assert.assertTrue(port.getString("@type").equals("STUB"));
+                Assert.assertTrue(port_node.getInt("@id") == 51966);
+                Assert.assertTrue(port_node.getString("@type").equals("STUB"));
+            }
+
+            if (act.getString("@type").equals("setDlSrc")) {
+                byte srcMatch[] = { (byte) 5, (byte) 4, (byte) 3, (byte) 2,
+                        (byte) 1 };
+                String src = act.getString("address");
+                byte srcBytes[] = new byte[5];
+                srcBytes[0] = Byte.parseByte(src.substring(0, 2));
+                srcBytes[1] = Byte.parseByte(src.substring(2, 4));
+                srcBytes[2] = Byte.parseByte(src.substring(4, 6));
+                srcBytes[3] = Byte.parseByte(src.substring(6, 8));
+                srcBytes[4] = Byte.parseByte(src.substring(8, 10));
+                Assert.assertTrue(Arrays.equals(srcBytes, srcMatch));
+            }
+
+            if (act.getString("@type").equals("setDlDst")) {
+                byte dstMatch[] = { (byte) 1, (byte) 2, (byte) 3, (byte) 4,
+                        (byte) 5 };
+                String dst = act.getString("address");
+                byte dstBytes[] = new byte[5];
+                dstBytes[0] = Byte.parseByte(dst.substring(0, 2));
+                dstBytes[1] = Byte.parseByte(dst.substring(2, 4));
+                dstBytes[2] = Byte.parseByte(dst.substring(4, 6));
+                dstBytes[3] = Byte.parseByte(dst.substring(6, 8));
+                dstBytes[4] = Byte.parseByte(dst.substring(8, 10));
+                Assert.assertTrue(Arrays.equals(dstBytes, dstMatch));
+            }
+            if (act.getString("@type").equals("setDlType"))
+                Assert.assertTrue(act.getInt("dlType") == 10);
+            if (act.getString("@type").equals("setVlanId"))
+                Assert.assertTrue(act.getInt("vlanId") == 2);
+            if (act.getString("@type").equals("setVlanPcp"))
+                Assert.assertTrue(act.getInt("pcp") == 3);
+            if (act.getString("@type").equals("setVlanCfi"))
+                Assert.assertTrue(act.getInt("cfi") == 1);
+
+            if (act.getString("@type").equals("setNwSrc"))
+                Assert.assertTrue(act.getString("address").equals("2.2.2.2"));
+            if (act.getString("@type").equals("setNwDst"))
+                Assert.assertTrue(act.getString("address").equals("1.1.1.1"));
+
+            if (act.getString("@type").equals("pushVlan")) {
+                int head = act.getInt("VlanHeader");
+                // parsing vlan header
+                int id = head & 0xfff;
+                int cfi = (head >> 12) & 0x1;
+                int pcp = (head >> 13) & 0x7;
+                int tag = (head >> 16) & 0xffff;
+                Assert.assertTrue(id == 1234);
+                Assert.assertTrue(cfi == 1);
+                Assert.assertTrue(pcp == 1);
+                Assert.assertTrue(tag == 0x8100);
+            }
+            if (act.getString("@type").equals("setNwTos"))
+                Assert.assertTrue(act.getInt("tos") == 16);
+            if (act.getString("@type").equals("setTpSrc"))
+                Assert.assertTrue(act.getInt("port") == 4201);
+            if (act.getString("@type").equals("setTpDst"))
+                Assert.assertTrue(act.getInt("port") == 8080);
+        } catch (Exception e) {
+            Assert.assertTrue(false);
+        }
+    }
+
     // Configure the OSGi container
     @Configuration
     public Option[] config() {
index ff44fd4..9c47b3b 100644 (file)
@@ -7,6 +7,7 @@ import org.apache.felix.dm.Component;
 
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
 import org.opendaylight.controller.sal.core.IContainerListener;
+import org.opendaylight.controller.sal.utils.INodeFactory;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.discovery.IDiscoveryService;
@@ -103,7 +104,7 @@ public class Activator extends ComponentActivatorAbstractBase {
     }
     
     public Object[] getGlobalImplementations() {
-        Object[] res = { FlowProgrammerService.class };
+        Object[] res = { FlowProgrammerService.class, StubNodeFactory.class };
         return res;
     }
     
@@ -116,5 +117,14 @@ public class Activator extends ComponentActivatorAbstractBase {
             props.put("protocolPluginType", "STUB");
             c.setInterface(IPluginInFlowProgrammerService.class.getName(), props);
         }
+        if (imp.equals(StubNodeFactory.class)) {
+            // export the service to be used by SAL
+            Dictionary<String, Object> props = new Hashtable<String, Object>();
+            // Set the protocolPluginType property which will be used
+            // by SAL
+            props.put("protocolPluginType", "STUB");
+            props.put("protocolName", "STUB");
+            c.setInterface(INodeFactory.class.getName(), props);
+        }
     }
 }
diff --git a/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java b/opendaylight/protocol_plugins/stub/src/main/java/org/opendaylight/controller/protocol_plugins/stub/internal/StubNodeFactory.java
new file mode 100644 (file)
index 0000000..c2ce473
--- /dev/null
@@ -0,0 +1,48 @@
+package org.opendaylight.controller.protocol_plugins.stub.internal;
+
+import org.opendaylight.controller.sal.core.ConstructionException;
+import org.opendaylight.controller.sal.utils.INodeFactory;
+import org.opendaylight.controller.sal.core.Node;
+
+public class StubNodeFactory implements INodeFactory
+    {
+      void init() {
+      }
+
+      /**
+       * Function called by the dependency manager when at least one dependency
+       * become unsatisfied or when the component is shutting down because for
+       * example bundle is being stopped.
+       * 
+       */
+      void destroy() {
+      }
+
+      /**
+       * Function called by dependency manager after "init ()" is called and after
+       * the services provided by the class are registered in the service registry
+       * 
+       */
+      void start() {
+      }
+
+      /**
+       * Function called by the dependency manager before the services exported by
+       * the component are unregistered, this will be followed by a "destroy ()"
+       * calls
+       * 
+       */
+      void stop() {
+      }
+      
+      public Node fromString(String nodeId, String nodeType){
+          if(nodeType.equals("STUB"))
+              try{
+                  return new Node("STUB", Integer.parseInt(nodeId));
+              } catch(ConstructionException e)
+              {
+                  return null;
+              }
+          return null;
+      }
+}
index ea9d93b..4c7f278 100644 (file)
@@ -30,6 +30,8 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.opendaylight.controller.sal.utils.HexEncode;
+import org.opendaylight.controller.sal.utils.INodeFactory;
+import org.opendaylight.controller.sal.utils.ServiceHelper;
 
 /**
  * Describe a generic network element in multiple SDNs technologies. A
@@ -437,9 +439,13 @@ public class Node implements Serializable {
                 return null;
             }
         } else {
-            // We need to lookup via OSGi service registry for an
-            // handler for this
+            //Use INodeFactory to create a Node of registered Node type.
+            //The protocol plugin being used depends on typeStr.
+            INodeFactory f = (INodeFactory) ServiceHelper
+                    .getGlobalInstance(INodeFactory.class, new Node(), "(protocolName="+typeStr+")");
+            if(f==null)
+                return null;
+            return f.fromString(IDStr, typeStr);
         }
-        return null;
     }
 }
diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/INodeFactory.java
new file mode 100644 (file)
index 0000000..29ba7d6
--- /dev/null
@@ -0,0 +1,27 @@
+
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.controller.sal.utils;
+
+import org.opendaylight.controller.sal.core.Node;
+
+/**
+ * @file   INodeFactory.java
+ *
+ * @brief  Define the interface to be called when looking up custom node types
+ *
+ */
+
+public interface INodeFactory {
+    /**
+     * Method to get custom node types from protocol plugins
+     *
+     */
+    public Node fromString(String nodeId, String nodeType);
+}
index 83db18e..188fb92 100644 (file)
     <dependencies>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
+            <artifactId>maven-core</artifactId>
             <version>3.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-            <version>2.2.1</version>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>3.0.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <version>1.8.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+               <groupId>junit</groupId>
+               <artifactId>junit</artifactId>
+               <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <reporting>
         </plugins>
     </build>
 
-</project>
\ No newline at end of file
+</project>