From 81391595dca425ae58e2294898f09f11d9a32dbc Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Tue, 22 Sep 2015 12:49:09 -0700
Subject: bringing src to commit tag 65d551b50e782b0c1ea76c1a9ed1c5a801a5a7e4

Change-Id: Ib2da78962eaef856f418636c31b0f5c84286244f
---
 framework/src/onos/apps/routing-api/pom.xml                 |  2 +-
 .../main/java/org/onosproject/routing/config/Interface.java | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'framework/src/onos/apps/routing-api')

diff --git a/framework/src/onos/apps/routing-api/pom.xml b/framework/src/onos/apps/routing-api/pom.xml
index 1b9fc2fa..48fc2920 100644
--- a/framework/src/onos/apps/routing-api/pom.xml
+++ b/framework/src/onos/apps/routing-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/framework/src/onos/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java b/framework/src/onos/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
index d6f6e574..8d563b87 100644
--- a/framework/src/onos/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
+++ b/framework/src/onos/apps/routing-api/src/main/java/org/onosproject/routing/config/Interface.java
@@ -21,7 +21,6 @@ import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.host.PortAddresses;
 
 import java.util.Objects;
 import java.util.Set;
@@ -54,18 +53,6 @@ public class Interface {
         this.vlan = vlan;
     }
 
-    /**
-     * Creates an Interface based on a PortAddresses object.
-     *
-     * @param portAddresses the PortAddresses object to turn into an Interface
-     */
-    public Interface(PortAddresses portAddresses) {
-        connectPoint = portAddresses.connectPoint();
-        ipAddresses = Sets.newHashSet(portAddresses.ipAddresses());
-        macAddress = portAddresses.mac();
-        vlan = portAddresses.vlan();
-    }
-
     /**
      * Retrieves the connection point that this interface maps to.
      *
-- 
cgit 1.2.3-korg