TopologyEdgeProto translator has been updated to support port numbers

dnosproject · Feb 12, 2019 · 3beb7be · 3beb7be
1 parent a962f56
commit 3beb7be
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/grpc-integration/app/src/main/java/org/onosproject/FlowServiceManager.java b/grpc-integration/app/src/main/java/org/onosproject/FlowServiceManager.java
@@ -70,14 +70,19 @@ public void addFlow(FlowRuleProto flowRuleRequest,
 
     flowRuleService = DefaultServiceDirectory.getService(FlowRuleService.class);
     coreService = DefaultServiceDirectory.getService(CoreService.class);
-    FlowRule.Builder flowRule = FlowRuleProtoTranslator.translate(flowRuleRequest);
+    FlowRule flowRule = null;
+
     if (flowRuleRequest.getAppName() != null) {
       ApplicationId applicationId = coreService.registerApplication(flowRuleRequest.getAppName());
-      flowRule.fromApp(applicationId);
+      flowRule = FlowRuleProtoTranslator.translate(applicationId,flowRuleRequest);
     }
 
+    if(flowRule == null) {
+        log.error("Format of flow rule is not correct");
+        return;
+    }
 
-    flowRuleService.applyFlowRules(flowRule.build());
+    flowRuleService.applyFlowRules(flowRule);
 
     FlowServiceStatus flowServiceStatus = FlowServiceStatus
             .newBuilder().setStat(true).build();
@@ -90,19 +95,24 @@ public void removeFlow(FlowRuleProto flowRuleRequest,
                          StreamObserver<FlowServiceStatus> responseObserver)  {
       flowRuleService = DefaultServiceDirectory.getService(FlowRuleService.class);
 
-      FlowRule.Builder flowRule = FlowRuleProtoTranslator.translate(flowRuleRequest);
+      FlowRule flowRule = null;
+
       if (flowRuleRequest.getAppName() != null) {
-          ApplicationId applicationId = coreService.registerApplication(flowRuleRequest.getAppName());
-          flowRule.fromApp(applicationId);
+          ApplicationId applicationId = coreService
+                  .registerApplication(flowRuleRequest.getAppName());
+          flowRule = FlowRuleProtoTranslator.translate(applicationId,flowRuleRequest);
       }
 
-      flowRuleService.removeFlowRules(flowRule.build());
+      if(flowRule == null) {
+        log.error("Format of flow rule is not correct");
+        return;
+      }
 
+      flowRuleService.removeFlowRules(flowRule);
       FlowServiceStatus flowServiceStatus = FlowServiceStatus
               .newBuilder().setStat(true).build();
       responseObserver.onNext(flowServiceStatus);
       responseObserver.onCompleted();
 
-
   }
 }
diff --git a/...main/java/org/onosproject/incubator/protobuf/models/net/flow/FlowRuleProtoTranslator.java b/...main/java/org/onosproject/incubator/protobuf/models/net/flow/FlowRuleProtoTranslator.java
@@ -17,6 +17,7 @@
 
 
 
+import org.onosproject.core.ApplicationId;
 import org.onosproject.grpc.net.flow.models.FlowRuleProto;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.flow.DefaultFlowRule;
@@ -63,19 +64,22 @@ public static FlowRuleProto translate(FlowRule flowRule) {
      * @param flowRule gRPC message
      * @return {@link FlowRule}
      */
-    public static FlowRule.Builder translate(FlowRuleProto flowRule) {
+    public static FlowRule translate(ApplicationId applicationId,
+                                     FlowRuleProto flowRule) {
 
         if (flowRule.equals(FlowRuleProto.getDefaultInstance())) {
             return null;
         }
 
         DeviceId deviceId = DeviceId.deviceId(flowRule.getDeviceId());
 
+
         FlowRule.FlowRemoveReason reason =
                 FlowRuleEnumsProtoTranslator.translate(flowRule.getReason()).get();
 
         FlowRule.Builder resultBuilder = new DefaultFlowRule.Builder();
 
+        resultBuilder.fromApp(applicationId);
         resultBuilder.forDevice(deviceId);
         resultBuilder.forTable(flowRule.getTableId());
         resultBuilder.withPriority(flowRule.getPriority());
@@ -91,7 +95,7 @@ public static FlowRule.Builder translate(FlowRuleProto flowRule) {
             resultBuilder.makeTemporary(flowRule.getTimeout());
         }
 
-        return resultBuilder;
+        return resultBuilder.build();
     }
 
     // Utility class not intended for instantiation.

diff --git a/...a/org/onosproject/incubator/protobuf/models/net/topology/TopologyEdgeProtoTranslator.java b/...a/org/onosproject/incubator/protobuf/models/net/topology/TopologyEdgeProtoTranslator.java
@@ -63,11 +63,13 @@ public static TopologyEdgeProto translate(TopologyEdge topologyEdge) {
         ConnectPointProto srcConnectPointProto = ConnectPointProto
                 .newBuilder()
                 .setDeviceId(topologyEdge.link().src().deviceId().toString())
+                .setPortNumber(topologyEdge.link().src().port().name())
                 .build();
 
         ConnectPointProto dstConnectPointProto = ConnectPointProto
                 .newBuilder()
                 .setDeviceId(topologyEdge.link().dst().deviceId().toString())
+                .setPortNumber(topologyEdge.link().dst().port().name())
                 .build();
 
         LinkStateProto linkStateProto = LinkStateProto