Bump upstream versions

[neutron.git] / model / src / main / yang / neutron-provider.yang

diff --git a/model/src/main/yang/neutron-provider.yang b/model/src/main/yang/neutron-provider.yang
index 3e510a1688cb3529d2d4a27359a06150c2a30634..c84aba2b882eb1c413306d82801368bc4227b140 100644 (file)
--- a/model/src/main/yang/neutron-provider.yang
+++ b/model/src/main/yang/neutron-provider.yang
@@ -1,9 +1,10 @@
-//
-// Copyright (c) 2012-2014 by Brocade Communications Systems, Inc. All Rights Reserved.
-//
-// This software is licensed, and not freely redistributable. See the
-// license agreement for details.
-//
+/*
+ * Copyright (c) 2015 Brocade Communications Systems, 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
+ */
 module neutron-provider {
 
     yang-version 1;
@@ -12,26 +13,20 @@ module neutron-provider {
 
     prefix neutron-provider;
 
-    import ietf-yang-types { prefix "yang"; }
-    // It requires rfc6991 (revision 2013-07-15), but odl don't have it, so this patch verify build will fail.
-    import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; }
-    import neutron-attrs { prefix "attrs"; }
     import neutron-networks { prefix "networks"; }
 
     organization "OpenDaylight Neutron Group";
 
-    contact "J. Gregory Hall <ghall@brocade.com>";
+    contact "J. Gregory Hall <ghall@brocade.com>, Kiran Sreenivasa <kkoushik@brocade.com>";
 
-    description "This YANG module defines provider attributes that are used by Openstack
-        Ice House Neutron YANG modules.";
+    description "This YANG module defines Openstack Neutron Provider extension attributes";
 
-    revision "2014-10-02" {
+    revision "2015-07-12" {
         description
-                "Initial version of provider attributes used by OpenStack Ice House Neutron
-                models";
+                "OpenDaylight Beryllium release";
     }
 
-    grouping provider-attrs {
+    grouping provider-attributes {
         leaf physical-network {
             type string;
             description "The physical network where this network object is implemented.
@@ -52,18 +47,10 @@ module neutron-provider {
                         is vlan, this ID is a vlan identifier. If network-type is gre,
                         this ID is a gre key.";
         }
-    }
-
-    augment "/networks:networks/networks:network"{
-        description "
-          This module augments the networks container in the neutron-networks
-          module with provider information.
-          ";
-        list providers {
-            description "List of provider network(s) associated with this network.";
-            key segmentation-id;
-            uses provider-attrs;
+        leaf segmentation-index {
+            type uint32;
+            description "A hidden counter to act as a key, because
+                        segmentation id is not required.";
         }
-        uses provider-attrs;
     }
 }