Merge "Use ${project.version} for internal dependencies"

[ovsdb.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / api / VlanConfigurationCache.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java
index 72822ab5e5df5af7e07bce97400d1024388957a2..0e4b2b016e7d0950a233cc0ce556f687671b934b 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/VlanConfigurationCache.java
@@ -1,16 +1,14 @@
 /*
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (c) 2014, 2015 Red Hat, Inc. 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
- *
- * Authors : Dave Tucker
  */
 
 package org.opendaylight.ovsdb.openstack.netvirt.api;
 
-import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 
 /**
  * This cache stores the VLAN assignments used for tenant separation within a vSwitch
@@ -20,25 +18,25 @@ public interface VlanConfigurationCache {
 
     /**
      * Assigns a free VLAN ID for the given tenant network
-     * @param node an Open vSwitch {@link org.opendaylight.controller.sal.core.Node}
+     * @param node an Open vSwitch {@link Node}
      * @param networkId the Neutron Network ID
      * @return a VLAN ID or 0 in case of an error
      */
-    public Integer assignInternalVlan (Node node, String networkId);
+    Integer assignInternalVlan(Node node, String networkId);
 
     /**
      * Recovers an assigned VLAN ID when it is no longer required
-     * @param node an Open vSwitch {@link org.opendaylight.controller.sal.core.Node}
+     * @param node an Open vSwitch {@link Node}
      * @param networkId the Neutron Network ID
      * @return the reclaimed VLAN ID or 0 in case of an error
      */
-    public Integer reclaimInternalVlan (Node node, String networkId);
+    Integer reclaimInternalVlan(Node node, String networkId);
 
     /**
      * Returns a VLAN ID assigned to a given tenant network
-     * @param node an Open vSwitch {@link org.opendaylight.controller.sal.core.Node}
+     * @param node an Open vSwitch {@link Node}
      * @param networkId the Neutron Network ID
      * @return the VLAN ID or 0 in case of an error
      */
-    public Integer getInternalVlan (Node node, String networkId);
+    Integer getInternalVlan(Node node, String networkId);
 }