홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
15124cf1 2 parents 98eda53b 68fef9d9

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 1 changed file with 18 additions and 2 deletions
...@@ -22,11 +22,11 @@ import java.util.HashMap; ...@@ -22,11 +22,11 @@ import java.util.HashMap;
22 import java.util.HashSet; 22 import java.util.HashSet;
23 import java.util.LinkedList; 23 import java.util.LinkedList;
24 24
25 -import org.onlab.onos.core.DefaultApplicationId;
26 import org.onlab.onos.cluster.ControllerNode; 25 import org.onlab.onos.cluster.ControllerNode;
27 import org.onlab.onos.cluster.DefaultControllerNode; 26 import org.onlab.onos.cluster.DefaultControllerNode;
28 import org.onlab.onos.cluster.NodeId; 27 import org.onlab.onos.cluster.NodeId;
29 import org.onlab.onos.cluster.RoleInfo; 28 import org.onlab.onos.cluster.RoleInfo;
29 +import org.onlab.onos.core.DefaultApplicationId;
30 import org.onlab.onos.mastership.MastershipTerm; 30 import org.onlab.onos.mastership.MastershipTerm;
31 import org.onlab.onos.net.ConnectPoint; 31 import org.onlab.onos.net.ConnectPoint;
32 import org.onlab.onos.net.DefaultAnnotations; 32 import org.onlab.onos.net.DefaultAnnotations;
...@@ -59,6 +59,9 @@ import org.onlab.onos.net.flow.StoredFlowEntry; ...@@ -59,6 +59,9 @@ import org.onlab.onos.net.flow.StoredFlowEntry;
59 import org.onlab.onos.net.flow.criteria.Criteria; 59 import org.onlab.onos.net.flow.criteria.Criteria;
60 import org.onlab.onos.net.flow.criteria.Criterion; 60 import org.onlab.onos.net.flow.criteria.Criterion;
61 import org.onlab.onos.net.flow.instructions.Instructions; 61 import org.onlab.onos.net.flow.instructions.Instructions;
62 +import org.onlab.onos.net.flow.instructions.L0ModificationInstruction;
63 +import org.onlab.onos.net.flow.instructions.L2ModificationInstruction;
64 +import org.onlab.onos.net.flow.instructions.L3ModificationInstruction;
62 import org.onlab.onos.net.host.DefaultHostDescription; 65 import org.onlab.onos.net.host.DefaultHostDescription;
63 import org.onlab.onos.net.host.HostDescription; 66 import org.onlab.onos.net.host.HostDescription;
64 import org.onlab.onos.net.intent.ConnectivityIntent; 67 import org.onlab.onos.net.intent.ConnectivityIntent;
...@@ -66,6 +69,7 @@ import org.onlab.onos.net.intent.HostToHostIntent; ...@@ -66,6 +69,7 @@ import org.onlab.onos.net.intent.HostToHostIntent;
66 import org.onlab.onos.net.intent.Intent; 69 import org.onlab.onos.net.intent.Intent;
67 import org.onlab.onos.net.intent.IntentId; 70 import org.onlab.onos.net.intent.IntentId;
68 import org.onlab.onos.net.intent.IntentState; 71 import org.onlab.onos.net.intent.IntentState;
72 +import org.onlab.onos.net.intent.LinkCollectionIntent;
69 import org.onlab.onos.net.intent.MultiPointToSinglePointIntent; 73 import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
70 import org.onlab.onos.net.intent.PathIntent; 74 import org.onlab.onos.net.intent.PathIntent;
71 import org.onlab.onos.net.intent.PointToPointIntent; 75 import org.onlab.onos.net.intent.PointToPointIntent;
...@@ -150,6 +154,17 @@ public final class KryoNamespaces { ...@@ -150,6 +154,17 @@ public final class KryoNamespaces {
150 DefaultTrafficTreatment.class, 154 DefaultTrafficTreatment.class,
151 Instructions.DropInstruction.class, 155 Instructions.DropInstruction.class,
152 Instructions.OutputInstruction.class, 156 Instructions.OutputInstruction.class,
157 + L0ModificationInstruction.class,
158 + L0ModificationInstruction.L0SubType.class,
159 + L0ModificationInstruction.ModLambdaInstruction.class,
160 + L2ModificationInstruction.class,
161 + L2ModificationInstruction.L2SubType.class,
162 + L2ModificationInstruction.ModEtherInstruction.class,
163 + L2ModificationInstruction.ModVlanIdInstruction.class,
164 + L2ModificationInstruction.ModVlanPcpInstruction.class,
165 + L3ModificationInstruction.class,
166 + L3ModificationInstruction.L3SubType.class,
167 + L3ModificationInstruction.ModIPInstruction.class,
153 RoleInfo.class, 168 RoleInfo.class,
154 FlowRuleBatchOperation.class, 169 FlowRuleBatchOperation.class,
155 CompletedBatchOperation.class, 170 CompletedBatchOperation.class,
...@@ -164,7 +179,8 @@ public final class KryoNamespaces { ...@@ -164,7 +179,8 @@ public final class KryoNamespaces {
164 DefaultEdgeLink.class, 179 DefaultEdgeLink.class,
165 HostToHostIntent.class, 180 HostToHostIntent.class,
166 PointToPointIntent.class, 181 PointToPointIntent.class,
167 - MultiPointToSinglePointIntent.class 182 + MultiPointToSinglePointIntent.class,
183 + LinkCollectionIntent.class
168 ) 184 )
169 .register(DefaultApplicationId.class, new DefaultApplicationIdSerializer()) 185 .register(DefaultApplicationId.class, new DefaultApplicationIdSerializer())
170 .register(URI.class, new URISerializer()) 186 .register(URI.class, new URISerializer())
......