Added license headers in cloudservicechain test

Also included fix from https://git.opendaylight.org/gerrit/42760
(reflection of NwConstants change in Genius) to enable
successful compilation.

Change-Id: Iee2a70a8527dabb936373330c4cc213f5049f84c
Signed-off-by: Abhinav Gupta <abhinav.gupta@ericsson.com>

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
index 6bbd7a9522d4edeca20b703a4d290817a31208b7..ebc796731255a9f7f1b6415fc8f8dc9b1e3dcd0c 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.netvirt.cloudservicechain;
 
 import static org.mockito.Matchers.eq;

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java
index a7fdbbec86444969b20e0040c9b750ad4af6b303..d4028c8906ae1ec45697e03bf53a0f0af9d1a6f2 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowEntityMatcher.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.netvirt.cloudservicechain.matchers;
 
 import org.apache.commons.lang3.StringUtils;

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java
index 1c817e4f4f659c9cf7f9bbee0102e8adf65e23b4..3cb16cfe8cdd41966431f2f1eeaca572f482b8ad 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/FlowMatcher.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.netvirt.cloudservicechain.matchers;
 
 import org.apache.commons.lang3.StringUtils;

diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java
index 4c04fece3c72d364f3e595e2917f191688737ace..e5659371778194c4161c2eb68718e30fb1de21ba 100644 (file)
--- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java
+++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/matchers/NodeIIdMatcher.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.netvirt.cloudservicechain.matchers;
 
 import java.util.List;

diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/yang/fibmanager-api.yang b/vpnservice/fibmanager/fibmanager-api/src/main/yang/fibmanager-api.yang
index 0d599bd95fe566eb90f1276e313c5b8e2115b512..dc277e28cea6c60d3031e78dd3c427a7176da7b9 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-api/src/main/yang/fibmanager-api.yang
+++ b/vpnservice/fibmanager/fibmanager-api/src/main/yang/fibmanager-api.yang
@@ -6,7 +6,7 @@ module fibmanager-api {
     import config { prefix config; revision-date 2013-04-05; }
 
     description
-        "Service definition for vpnmanager project";
+        "Service definition for fibmanager project";
 
     revision "2015-05-08" {
         description

diff --git a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java
index e5d8b5e37c734bbe8b3cc32e45ba5e2a1f9744b9..c269a0343c1f22dc74bed9520f7fae038402b216 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java
+++ b/vpnservice/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManager.java
@@ -2038,8 +2038,8 @@ public class FibManager extends AbstractDataChangeListener<VrfEntry> implements
     List<MatchInfo> matches = new ArrayList<MatchInfo>();
     matches.add(new MatchInfo(MatchFieldType.eth_type,
                               new long[] { NwConstants.ETHTYPE_MPLS_UC }));
-    FlowEntity flowEntityToLfib = MDSALUtil.buildFlowEntity(dpnId, NwConstants.L3_PROTOCOL_TABLE,
-                                                          getTableMissFlowRef(dpnId, NwConstants.L3_PROTOCOL_TABLE,
+    FlowEntity flowEntityToLfib = MDSALUtil.buildFlowEntity(dpnId, NwConstants.INTERNAL_TUNNEL_TABLE,
+                                                          getTableMissFlowRef(dpnId, NwConstants.INTERNAL_TUNNEL_TABLE,
                                                                   NwConstants.L3_LFIB_TABLE),
                                                           DEFAULT_FIB_FLOW_PRIORITY,
                                                           "Protocol Table For LFIB",