Merge "Parse the port number in setup()"

diff --git a/openstack/net-virt-sfc/impl/pom.xml b/openstack/net-virt-sfc/impl/pom.xml
index 7795793b612ea2b6079ced16c06f8581327b7683..80f9a173c98dee73663f28263858bb078b49d53e 100644 (file)
--- a/openstack/net-virt-sfc/impl/pom.xml
+++ b/openstack/net-virt-sfc/impl/pom.xml
@@ -159,7 +159,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
-          <propertyExpansion>checkstyle.checker.severity=error</propertyExpansion>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
       <plugin>

diff --git a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/openflow13/NetvirtSfcOF13Provider.java b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/openflow13/NetvirtSfcOF13Provider.java
index 24fb0913733a28a7be9a12ea3ed0400caa8fff60..0fabf9e6899dd21a93e23e1bb3d9a212b7acde6b 100644 (file)
--- a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/openflow13/NetvirtSfcOF13Provider.java
+++ b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/openflow13/NetvirtSfcOF13Provider.java
@@ -27,6 +27,7 @@ import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
 import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI;
 import org.opendaylight.sfc.sfc_ovs.provider.SfcOvsUtil;
+import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.ServiceFunctionForwarder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev150317.access.lists.Acl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev150317.access.lists.acl.access.list.entries.Ace;
@@ -93,7 +94,7 @@ public class NetvirtSfcOF13Provider implements INetvirtSfcOF13Provider{
 
         // Validate if any service function forwarder exists by the name, using SFC provider APIs.
         ServiceFunctionForwarder serviceForwarder =
-                SfcProviderServiceForwarderAPI.readServiceFunctionForwarder(sff.getName());
+                SfcProviderServiceForwarderAPI.readServiceFunctionForwarder(new SffName(sff.getName()));
         if (serviceForwarder == null) {
             LOG.debug("Service Function Forwarder = {} not yet configured. Skip processing !!", sff.getName());
             return;
@@ -131,12 +132,12 @@ public class NetvirtSfcOF13Provider implements INetvirtSfcOF13Provider{
             Iterator<Ace> itr = acl.getAccessListEntries().getAce().iterator();
             while (itr.hasNext()) {
                 Ace entry = itr.next();
-                programOFRules(entry, datapathId, true);
+                programOfRules(entry, datapathId, true);
             }
         }
     }
 
-    private void programOFRules(Ace entry, String datapathId, boolean write) {
+    private void programOfRules(Ace entry, String datapathId, boolean write) {
         NodeBuilder nodeBuilder = new NodeBuilder();
         nodeBuilder.setId(new NodeId(Constants.OPENFLOW_NODE_PREFIX + datapathId));
         nodeBuilder.setKey(new NodeKey(nodeBuilder.getId()));

diff --git a/openstack/net-virt-sfc/it/pom.xml b/openstack/net-virt-sfc/it/pom.xml
index d8467c53487c9711d9032c9b0f47f4effefcfe1c..a9dc254eb8da3537d5e12d93021c33bd993593fc 100644 (file)
--- a/openstack/net-virt-sfc/it/pom.xml
+++ b/openstack/net-virt-sfc/it/pom.xml
@@ -80,12 +80,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
       <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
         <configuration>
+          <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <!--<configuration>
           <excludes>
             <exclude>**/NetvirtSfcIT.java</exclude>
           </excludes>
-        </configuration>
+        </configuration>-->
       </plugin>
     </plugins>
   </build>