update IT for new SFC model changes for DPLs

[netvirt.git] / openstack / net-virt-sfc / it / src / test / java / org / opendaylight / ovsdb / openstack / netvirt / sfc / utils / ServiceFunctionForwarderUtils.java

diff --git a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java
index c9d4b4450ed7bd167f9a57a0a26b4fc1caa18bdb..7d041547cee22ab75c653952a71a692d6bc68265 100644 (file)
--- a/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java
+++ b/openstack/net-virt-sfc/it/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/utils/ServiceFunctionForwarderUtils.java
@@ -63,23 +63,24 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils {
     }
 
     public SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder(
-            SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder, String ip, int port) {
+            SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder, String sffDplName, String sfDplName) {
         return sffSfDataPlaneLocatorBuilder
-                .setSfDplName(new SfDataPlaneLocatorName("toSff1"))
-                .setSffDplName(new SffDataPlaneLocatorName("ulSff1Ingress"));
+                .setSfDplName(SfDataPlaneLocatorName.getDefaultInstance(sfDplName))
+                .setSffDplName(SffDataPlaneLocatorName.getDefaultInstance(sffDplName));
     }
 
     public ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder(
             ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder,
-            SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder) {
+            SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder,
+            String sfName) {
 
         return serviceFunctionDictionaryBuilder
-                .setName(new SfName("toSff1"))
+                .setName(SfName.getDefaultInstance(sfName))
                 .setSffSfDataPlaneLocator(sffSfDataPlaneLocatorBuilder.build());
     }
 
-    public OvsBridgeBuilder ovsBridgeBuilder(OvsBridgeBuilder ovsBridgeBuilder, String bridgeNme) {
-        return ovsBridgeBuilder.setBridgeName(bridgeNme);
+    public OvsBridgeBuilder ovsBridgeBuilder(OvsBridgeBuilder ovsBridgeBuilder, String bridgeName) {
+        return ovsBridgeBuilder.setBridgeName(bridgeName);
     }
 
     public ServiceFunctionForwarderBuilder serviceFunctionForwarderBuilder(
@@ -107,7 +108,7 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils {
 
     public ServiceFunctionForwarderBuilder serviceFunctionForwarderBuilder(
             String sffName, String sffIp, int port, String sffDplName,
-            String sfIp, String snName, String bridgeName) {
+            String sfIp, String snName, String bridgeName, String sfName, String sfDplName) {
 
         DataPlaneLocatorBuilder dataPlaneLocatorBuilder =
                 dataPlaneLocatorBuilder(new DataPlaneLocatorBuilder(), sffIp, port);
@@ -117,10 +118,10 @@ public class ServiceFunctionForwarderUtils extends AbstractUtils {
                 list(new ArrayList<SffDataPlaneLocator>(), sffDataPlaneLocatorBuilder);
 
         SffSfDataPlaneLocatorBuilder sffSfDataPlaneLocatorBuilder =
-                sffSfDataPlaneLocatorBuilder(new SffSfDataPlaneLocatorBuilder(), sffIp, port);
+                sffSfDataPlaneLocatorBuilder(new SffSfDataPlaneLocatorBuilder(), sffDplName, sfDplName);
         ServiceFunctionDictionaryBuilder serviceFunctionDictionaryBuilder =
                 serviceFunctionDictionaryBuilder(new ServiceFunctionDictionaryBuilder(),
-                        sffSfDataPlaneLocatorBuilder);
+                        sffSfDataPlaneLocatorBuilder, sfName);
         List<ServiceFunctionDictionary> serviceFunctionDictionaryList =
                 list(new ArrayList<ServiceFunctionDictionary>(), serviceFunctionDictionaryBuilder);