Squashed commit of the following:

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

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
index 99fa49f8480695b233dcc7640203bc5b714e8638..647b413c84d9e073542dd687071f56de0bcc47b4 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/TenantNetworkManager.java
@@ -4,25 +4,27 @@
  * 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.neutron.spi.NeutronNetwork;
-import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
+import org.opendaylight.neutron.spi.NeutronPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 
 /**
  * Open vSwitch isolates Tenant Networks using VLANs on the Integration Bridge
  * This class manages the provisioning of these VLANs
+ *
+ * @author Dave Tucker
+ * @author Sam Hague (shague@redhat.com)
  */
 public interface TenantNetworkManager {
 
     /**
      * Get the VLAN assigned to the provided Network
-     * @param node the {@link org.opendaylight.controller.sal.core.Node} to query
+     * @param node the {@link Node} to query
      * @param networkId the Neutron Network ID
      * @return the assigned VLAN ID or 0 in case of an error
      */
@@ -30,23 +32,22 @@ public interface TenantNetworkManager {
 
     /**
      * Reclaim the assigned VLAN for the given Network
-     * @param node the {@link org.opendaylight.controller.sal.core.Node} to query
-     * @param portUUID the UUID of the neutron Port
+     * @param node the {@link Node} to query
      * @param network the Neutron Network ID
      */
-    public void reclaimInternalVlan(Node node, String portUUID, NeutronNetwork network);
+    public void reclaimInternalVlan(Node node, NeutronNetwork network);
 
     /**
      * Configures the VLAN for a Tenant Network
-     * @param node the {@link org.opendaylight.controller.sal.core.Node} to configure
-     * @param portUUID the UUID of the port to configure
+     * @param node the {@link Node} to configure
+     * @param tp the termination point
      * @param network the Neutron Network ID
      */
-    public void programInternalVlan(Node node, String portUUID, NeutronNetwork network);
+    public void programInternalVlan(Node node, OvsdbTerminationPointAugmentation tp, NeutronNetwork network);
 
     /**
      * Check is the given network is present on a Node
-     * @param node the {@link org.opendaylight.controller.sal.core.Node} to query
+     * @param node the {@link Node} to query
      * @param segmentationId the Neutron Segementation ID
      * @return True or False
      */
@@ -57,17 +58,6 @@ public interface TenantNetworkManager {
      */
     public String getNetworkId (String segmentationId);
 
-    /**
-     * Get the {@link org.opendaylight.neutron.spi.NeutronNetwork} for a given Interface
-     */
-    public NeutronNetwork getTenantNetwork(Interface intf);
-
-    /**
-     * Network Created Callback
-     */
-    @Deprecated
-    public void networkCreated (String networkId);
-
     /**
      * Network Created Callback
      */
@@ -77,4 +67,6 @@ public interface TenantNetworkManager {
      * Network Deleted Callback
      */
     public void networkDeleted(String id);
-}
\ No newline at end of file
+    NeutronNetwork getTenantNetwork(OvsdbTerminationPointAugmentation terminationPointAugmentation);
+    public NeutronPort getTenantPort(OvsdbTerminationPointAugmentation terminationPointAugmentation);
+}