From: Robert Varga Date: Wed, 23 Oct 2019 09:07:24 +0000 (+0200) Subject: Remove unused model imports X-Git-Tag: release/magnesium~39 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=7ab6c458bfe29cc92634e969bb23bf796abffb8c;ds=sidebyside Remove unused model imports pyang is pointing out these imports as unused, fix them up. Change-Id: Id3d59d35d764bc91e1d381de72caca2622ae4a6d Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang index 34ffb1cfbf..f1a47cc716 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-people.yang @@ -1,42 +1,40 @@ module car-people { + yang-version 1; - yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:config:sal-clustering-it:car-people"; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:sal-clustering-it:car-people"; + prefix car; - prefix car; + import car { prefix "c"; revision-date 2014-08-18; } + import people { prefix "people"; revision-date 2014-08-18; } - import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } - import car { prefix "c"; revision-date 2014-08-18; } - import people { prefix "people"; revision-date 2014-08-18; } + organization "Netconf Central"; - organization "Netconf Central"; + contact + "Harman Singh "; - contact - "Harman Singh "; + description + "YANG model for car for test application"; + revision "2014-08-18" { description - "YANG model for car for test application"; + "Clustering sample app"; + } - revision "2014-08-18" { - description - "Clustering sample app"; - } - - container car-people { - description - "Top-level container for all people car map"; + container car-people { + description + "Top-level container for all people car map"; - list car-person { - key "car-id person-id"; - description "A mapping of cars and people."; - leaf car-id { - type c:car-id; - } + list car-person { + key "car-id person-id"; + description "A mapping of cars and people."; + leaf car-id { + type c:car-id; + } - leaf person-id { - type people:person-id; - } + leaf person-id { + type people:person-id; } } + } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang index b771346112..5497732b1d 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang +++ b/opendaylight/md-sal/samples/clustering-test-app/model/src/main/yang/car-purchase.yang @@ -1,60 +1,58 @@ module car-purchase { + yang-version 1; - yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:config:sal-clustering-it:car-purchase"; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:sal-clustering-it:car-purchase"; + prefix cp; - prefix cp; + import car { prefix "car"; revision-date 2014-08-18; } + import people { prefix "person"; revision-date 2014-08-18; } + import yang-ext {prefix "ext"; revision-date "2013-07-09";} - import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; } - import car { prefix "car"; revision-date 2014-08-18; } - import people { prefix "person"; revision-date 2014-08-18; } - import yang-ext {prefix "ext"; revision-date "2013-07-09";} + organization "Netconf Central"; - organization "Netconf Central"; + contact + "Harman Singh "; - contact - "Harman Singh "; + description + "YANG model for car purchase for test application"; + revision "2014-08-18" { description - "YANG model for car purchase for test application"; + "Clustering sample app"; + } - revision "2014-08-18" { - description - "Clustering sample app"; + rpc buy-car { + description + "buy a new car"; + input { + leaf person { + ext:context-reference "person:person-context"; + type person:person-ref; + description "A reference to a particular person."; + } + + leaf car-id { + type car:car-id; + description "identifier of car."; + } + leaf person-id { + type person:person-id; + description "identifier of person."; + } } + } - rpc buy-car { - description - "buy a new car"; - input { - leaf person { - ext:context-reference "person:person-context"; - type person:person-ref; - description "A reference to a particular person."; - } - - leaf car-id { - type car:car-id; - description "identifier of car."; - } - leaf person-id { - type person:person-id; - description "identifier of person."; - } - } - } - - notification carBought { - description - "Indicates that a person bought a car."; - leaf car-id { - type car:car-id; - description "identifier of car."; - } - leaf person-id { - type person:person-id; - description "identifier of person."; - } - } + notification carBought { + description + "Indicates that a person bought a car."; + leaf car-id { + type car:car-id; + description "identifier of car."; + } + leaf person-id { + type person:person-id; + description "identifier of person."; + } + } } diff --git a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang index 9fccb9950b..86a02b85d2 100644 --- a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang +++ b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology-inventory.yang @@ -5,9 +5,7 @@ module opendaylight-topology-inventory { prefix "nt"; import yang-ext { prefix "ext"; } - import ietf-inet-types { prefix "inet"; } import opendaylight-inventory {prefix "inv";} - import opendaylight-topology {prefix "odt";} import network-topology {prefix "topo"; revision-date "2013-10-21"; } organization "TBD"; diff --git a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang index c39759a2ea..c9600853bd 100644 --- a/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang +++ b/opendaylight/model/model-topology/src/main/yang/opendaylight-topology.yang @@ -6,7 +6,6 @@ module opendaylight-topology { import yang-ext { prefix "ext"; } import ietf-inet-types { prefix "inet"; } - import opendaylight-inventory {prefix "inv";} import network-topology {prefix "topo"; revision-date "2013-10-21"; } organization "TBD";