From f9f2fd59a157c46323d32b3615e851bb214d21e0 Mon Sep 17 00:00:00 2001
From: Nishchya Gupta <nishchyag@altencalsoftlabs.com>
Date: Thu, 16 Jan 2020 16:52:31 +0530
Subject: [PATCH] NETVIRT-1638 Modify yang modules such that it can be
 validated using pyang

Fixing pyang warning and errors.

Signed-off-by: Nishchya Gupta <nishchyag@altencalsoftlabs.com>
Change-Id: I7e23372010d4cbef5b645b90d8628b6af46f294b
---
 aclservice/api/src/main/yang/acl-live-statistics.yang | 1 -
 elanmanager/api/src/main/yang/etree.yang              | 2 --
 fibmanager/api/src/main/yang/fib-rpc.yang             | 5 -----
 natservice/api/src/main/yang/odl-nat.yang             | 1 -
 neutronvpn/api/src/main/yang/neutronvpn.yang          | 1 +
 qosservice/api/src/main/yang/qos-alert-config.yang    | 4 ++--
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/aclservice/api/src/main/yang/acl-live-statistics.yang b/aclservice/api/src/main/yang/acl-live-statistics.yang
index 75d792851d..d266e47725 100644
--- a/aclservice/api/src/main/yang/acl-live-statistics.yang
+++ b/aclservice/api/src/main/yang/acl-live-statistics.yang
@@ -3,7 +3,6 @@ module acl-live-statistics {
     prefix "acl-stats";
 
     import ietf-interfaces {prefix if;}
-    import aclservice {prefix aclservice; revision-date "2016-06-08";}
 
     description "YANG model describes RPC to retrieve ACL live statistics.";
 
diff --git a/elanmanager/api/src/main/yang/etree.yang b/elanmanager/api/src/main/yang/etree.yang
index 9693b01868..493af86656 100644
--- a/elanmanager/api/src/main/yang/etree.yang
+++ b/elanmanager/api/src/main/yang/etree.yang
@@ -8,8 +8,6 @@ module etree {
 
     import hwvtep {prefix hwvtep;}
 
-    import network-topology {prefix "topo"; revision-date "2013-10-21"; }
-
     revision "2016-06-14" {
         description "etree module";
     }
diff --git a/fibmanager/api/src/main/yang/fib-rpc.yang b/fibmanager/api/src/main/yang/fib-rpc.yang
index 3047472a3d..59ee0b9b47 100644
--- a/fibmanager/api/src/main/yang/fib-rpc.yang
+++ b/fibmanager/api/src/main/yang/fib-rpc.yang
@@ -2,11 +2,6 @@ module fib-rpc {
     namespace "urn:opendaylight:netvirt:fib:rpc";
     prefix "fib-rpc";
 
-    import ietf-inet-types {
-        prefix inet;
-        revision-date "2013-07-15";
-    }
-
     import opendaylight-flow-types {
         prefix offlow;
         revision-date "2013-10-26";
diff --git a/natservice/api/src/main/yang/odl-nat.yang b/natservice/api/src/main/yang/odl-nat.yang
index b65163b66d..5756bce3e7 100644
--- a/natservice/api/src/main/yang/odl-nat.yang
+++ b/natservice/api/src/main/yang/odl-nat.yang
@@ -3,7 +3,6 @@ module odl-nat {
     prefix odl-nat;
 
     import ietf-yang-types { prefix "yang"; /*revision-date 2013-07-15; */}
-    import ietf-inet-types { prefix "inet"; }
 
     revision "2016-01-11" {
         description "NAT Manager module";
diff --git a/neutronvpn/api/src/main/yang/neutronvpn.yang b/neutronvpn/api/src/main/yang/neutronvpn.yang
index 7489055842..f63fdf3598 100644
--- a/neutronvpn/api/src/main/yang/neutronvpn.yang
+++ b/neutronvpn/api/src/main/yang/neutronvpn.yang
@@ -234,6 +234,7 @@ module neutronvpn {
     /* container for DHCP Configuration */
     container dhcp-config {
         list configs {
+            key "lease-duration default-domain";
             leaf lease-duration {
                 type    int32;
                 description "default lease duration for dhcp lease.
diff --git a/qosservice/api/src/main/yang/qos-alert-config.yang b/qosservice/api/src/main/yang/qos-alert-config.yang
index d9d640285a..6113662345 100644
--- a/qosservice/api/src/main/yang/qos-alert-config.yang
+++ b/qosservice/api/src/main/yang/qos-alert-config.yang
@@ -3,12 +3,12 @@ module qosalert-config {
     namespace "urn:opendaylight:netvirt:qosalert:config";
     prefix "qosalert";
 
+    description "This YANG module defines QoS alert configuration.";
+
     revision "2017-03-01" {
         description "Initial revision of qosalert model";
     }
 
-    description "This YANG module defines QoS alert configuration.";
-
     container qosalert-config {
 
     config true;
-- 
2.36.6