Initial test of optical OXC experimenter messages

c_gen/c_test_gen.py

@@ -105,6 +105,8 @@ def var_name_map(m_type):
         of_bsn_vport_q_in_q_t="vport",
         of_bitmap_128_t="bitmap_128",
         of_checksum_128_t="checksum_128",
+	#Circuit extensions
+        oxm_of_och_sig_id_t="sig_id",		
         )
 
     if m_type.find("of_list_") == 0:

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchField.java

@@ -235,6 +235,15 @@ private MatchField(final String name, final MatchFields id, Prerequisite<?>... p
     public final static MatchField<ClassId> BSN_VLAN_XLATE_PORT_GROUP_ID =
             new MatchField<ClassId>("bsn_vlan_xlate_port_group_id", MatchFields.BSN_VLAN_XLATE_PORT_GROUP_ID);
 
+
+    public final static MatchField<U64> OCH_SIGID =
+            new MatchField<U64>("och_sigid",
+                                    MatchFields.OCH_SIGID);
+
+    public final static MatchField<U64> OCH_SIGTYPE =
+            new MatchField<U64>("och_sigid",
+                                    MatchFields.OCH_SIGTYPE);
+
     public String getName() {
         return name;
     }

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/protocol/match/MatchFields.java

@@ -57,4 +57,6 @@ public enum MatchFields {
     BSN_UDF7,
     BSN_TCP_FLAGS,
     BSN_VLAN_XLATE_PORT_GROUP_ID,
+    OCH_SIGID,
+    OCH_SIGTYPE;
 }

java_gen/pre-written/src/test/java/org/projectfloodlight/protocol/OFOxmTest.java

@@ -59,4 +59,6 @@ public void testGetCanonicalNormalMask() {
         OFOxm<IPv4Address> canonical = ipv4SrcMasked.getCanonical();
         assertEquals(ipv4SrcMasked, canonical);
     }
+
+
 }

java_gen/pre-written/src/test/java/org/projectfloodlight/protocol/match/MatchFieldIteration13Test.java

@@ -1,10 +1,22 @@
 package org.projectfloodlight.protocol.match;
 
+import org.junit.Test;
 import org.projectfloodlight.openflow.protocol.OFFactories;
 import org.projectfloodlight.openflow.protocol.OFVersion;
+import org.projectfloodlight.openflow.protocol.match.Match;
+import org.projectfloodlight.openflow.protocol.match.MatchField;
+import org.projectfloodlight.openflow.types.U64;
 
 public class MatchFieldIteration13Test extends MatchFieldIterationBase {
     public MatchFieldIteration13Test() {
         super(OFFactories.getFactory(OFVersion.OF_13));
     }
+
+    @Test
+    public void matchCircuitFields()
+    {
+        Match.Builder builder = factory.buildMatchV3().setExact(MatchField
+                                                                        .OCH_SIGTYPE, U64.ZERO);
+
+    }
 }

java_gen/pre-written/src/test/java/org/projectfloodlight/protocol/match/MatchFieldIterationBase.java

@@ -25,7 +25,7 @@
 
 public class MatchFieldIterationBase {
 
-    private OFFactory factory;
+    protected OFFactory factory;
 
     protected MatchFieldIterationBase(OFFactory factory) {
         this.factory = factory;

openflow_input/oxm-1.3

@@ -40,3 +40,19 @@ struct of_oxm_tunnel_id_masked : of_oxm {
     uint64_t value;
     uint64_t value_mask;
 };
+
+struct of_oxm_och_sigtype : of_oxm {
+    uint32_t type_len == 0x80005c08;
+    uint64_t value;
+};
+
+
+struct of_oxm_och_sigid : of_oxm {
+    uint32_t type_len == 0x80005d10;
+    uint64_t value;
+};
+
+
+
+
+