yang model revise: neutron-network.yang

This patch revises neutron network model.
This patch drops deprecated methods in neutron spi.

Change-Id: Ib8a6ba9928f504dc4567ec2e08a8aac4387f38dd
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/model/src/main/yang/neutron-networks.yang b/model/src/main/yang/neutron-networks.yang
index 6b2bac81070f273c99e876f20e27295ac94cb0c5..58555ba0e34dbbe2a29026ff19b79411daf3a078 100644 (file)
--- a/model/src/main/yang/neutron-networks.yang
+++ b/model/src/main/yang/neutron-networks.yang
@@ -13,7 +13,6 @@ module neutron-networks {
 
     prefix neutron-networks;
 
-    import ietf-yang-types { prefix "yang"; }
     import neutron-attrs { prefix "attrs"; }
 
     organization "OpenDaylight Neutron Group";

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
index 4000b9aca67168d712c39952c1c9359a8ea2be09..fae48009639a4d774d19779362c6a5ef83e2c818 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
@@ -89,16 +89,6 @@ public class NeutronNetwork extends NeutronObject implements Serializable, INeut
         }
     }
 
-    @Deprecated
-    public String getNetworkUUID() {
-        return getID();
-    }
-
-    @Deprecated
-    public void setNetworkUUID(String uuid) {
-        setID(uuid);
-    }
-
     public String getNetworkName() {
         return networkName;
     }