Merge "Add feature identity for qos rule types"

diff --git a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
index 85f50734221b60142759250b5ee3f1e15055f6c0..21211c7ff265a6b94b0ba2ec49e11de46ced45db 100644 (file)
--- a/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
+++ b/model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/neutron/constants/rev150712/NeutronUtils.java
@@ -51,6 +51,7 @@ public final class NeutronUtils {
             .put("tcp", ProtocolTcp.class)
             .put("udp", ProtocolUdp.class)
             .put("icmpv6", ProtocolIcmpV6.class)
+            .put("igmp", ProtocolIgmp.class)
             .build();
 
         public static Class<? extends ProtocolBase> get(String key) {

diff --git a/model/src/main/yang/neutron-constants.yang b/model/src/main/yang/neutron-constants.yang
index c8f23162790460febce87cfb05729c79998eb8d8..4b5ce029e549b8683185eb59006db6d661594de6 100644 (file)
--- a/model/src/main/yang/neutron-constants.yang
+++ b/model/src/main/yang/neutron-constants.yang
@@ -61,6 +61,11 @@ module neutron-constants {
         base protocol-base;
     }
 
+    identity protocol-igmp {
+        description "IGMP protocol.";
+        base protocol-base;
+    }
+
     // PROBE
     identity probe-base {
         description "Base identity for all probes";

diff --git a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigsDataBrokerTest.java b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigsDataBrokerTest.java
index 20040f717067130500bdce6c67063450d3228ae3..f284750c3ace3261ab45592b4e55d9101a8ded0b 100644 (file)
--- a/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigsDataBrokerTest.java
+++ b/neutron-hostconfig/vpp/src/test/java/org/opendaylight/neutron/hostconfig/vpp/HostconfigsDataBrokerTest.java
@@ -13,14 +13,14 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 
-import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest;
+import org.opendaylight.controller.md.sal.binding.test.AbstractConcurrentDataBrokerTest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 
-public class HostconfigsDataBrokerTest extends AbstractDataChangeListenerTest {
+public class HostconfigsDataBrokerTest extends AbstractConcurrentDataBrokerTest {
 
     @Override
     protected Iterable<YangModuleInfo> getModuleInfos() throws Exception {