commit faf04d7cf631287bcc9b508fded26813b42c92dc
author m.rahil <m.rahil@partner.samsung.com> Fri May 24 21:11:22 2019 +0530
committer Jaegon Kim <jaegon77.kim@samsung.com> Sat Jul 06 05:02:03 2019 +0000
tree da17c51e77d786cee8021c494b46863080d3c6c5
parent 76ca799cd48d69a480e3aab3ac412476ec76c599

ovs bridge creation using static data model support

Change-Id: I74a0c6ef0344599c709359b65586420ce8535606

apps/workflow/ofoverlay/app/src/main/java/org/onosproject/ofoverlay/impl/OfOverlayWorkflow.java

diff --git a/apps/workflow/ofoverlay/app/src/main/java/org/onosproject/ofoverlay/impl/OfOverlayWorkflow.java b/apps/workflow/ofoverlay/app/src/main/java/org/onosproject/ofoverlay/impl/OfOverlayWorkflow.java
index 2267337..b397db5 100644
--- a/apps/workflow/ofoverlay/app/src/main/java/org/onosproject/ofoverlay/impl/OfOverlayWorkflow.java
+++ b/apps/workflow/ofoverlay/app/src/main/java/org/onosproject/ofoverlay/impl/OfOverlayWorkflow.java
@@ -92,11 +92,10 @@
                     //.attribute(WorkflowAttribute.REMOVE_AFTER_COMPLETE)
                     .chain(Ovs.CreateOvsdbDevice.class.getName())
                     .chain(Ovs.UpdateOvsVersion.class.getName())
-                    .chain(Ovs.UpdateOverlayBridgeId.class.getName())
+                    .chain(Ovs.UpdateBridgeId.class.getName())
                     .chain(DefaultWorkletDescription.builder().name(Ovs.CreateBridge.class.getName())
                             .staticDataModel(BRIDGE_NAME, "br-int")
                             .build())
-                    .chain(Ovs.UpdateUnderlayBridgeId.class.getName())
                     .chain(DefaultWorkletDescription.builder().name(Ovs.CreateBridge.class.getName())
                             .staticDataModel(BRIDGE_NAME, "br-phy")
                             .build())
@@ -114,10 +113,12 @@
                     //.attribute(WorkflowAttribute.REMOVE_AFTER_COMPLETE)
                     .chain(Ovs.CreateOvsdbDevice.class.getName())
                     .chain(Ovs.UpdateOvsVersion.class.getName())
-                    .chain(Ovs.UpdateOverlayBridgeId.class.getName())
+                    .chain(Ovs.UpdateBridgeId.class.getName())
                     .chain(Ovs.CreateOverlayBridgeMultiEvent.class.getName())
-                    .chain(Ovs.UpdateUnderlayBridgeId.class.getName())
-                    .chain(Ovs.CreateUnderlayBridge.class.getName())
+                    .chain(Ovs.UpdateBridgeId.class.getName())
+                    .chain(DefaultWorkletDescription.builder().name(Ovs.CreateBridge.class.getName())
+                            .staticDataModel(BRIDGE_NAME, "br-phy")
+                            .build())
                     .chain(Ovs.CreateOverlayBridgeVxlanPort.class.getName())
                     .chain(Ovs.AddPhysicalPortsOnUnderlayBridge.class.getName())
                     .chain(Ovs.ConfigureUnderlayBridgeLocalIp.class.getName())
@@ -152,8 +153,10 @@
                     .id(uri)
                     .chain(Ovs.CreateOvsdbDevice.class.getName())
                     .chain(Ovs.UpdateOvsVersion.class.getName())
-                    .chain(Ovs.UpdateUnderlayBridgeId.class.getName())
-                    .chain(Ovs.CreateUnderlayBridge.class.getName())
+                    .chain(Ovs.UpdateBridgeId.class.getName())
+                    .chain(DefaultWorkletDescription.builder().name(Ovs.CreateBridge.class.getName())
+                            .staticDataModel(BRIDGE_NAME, "br-phy")
+                            .build())
                     .chain(Ovs.AddPhysicalPortsOnUnderlayBridge.class.getName())
                     .build();
             workflowStore.register(workflow);
@@ -163,8 +166,10 @@
                     .id(uri)
                     .chain(Ovs.CreateOvsdbDevice.class.getName())
                     .chain(Ovs.UpdateOvsVersion.class.getName())
-                    .chain(Ovs.UpdateUnderlayBridgeId.class.getName())
-                    .chain(Ovs.CreateUnderlayBridge.class.getName())
+                    .chain(Ovs.UpdateBridgeId.class.getName())
+                    .chain(DefaultWorkletDescription.builder().name(Ovs.CreateBridge.class.getName())
+                            .staticDataModel(BRIDGE_NAME, "br-phy")
+                            .build())
                     .chain(Ovs.AddPhysicalPortsOnUnderlayBridge.class.getName())
                     .build();
             workflowStore.register(workflow);