From c038a8d7a32f350cf88d952b4978bbaf9585d222 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 3 Apr 2019 13:35:27 +0200 Subject: [PATCH] Updated namespace to use OSM URN; renamed rw-project to osm-project Change-Id: Ic1c89c9e7904483ae68da5741e551870117a3225 Signed-off-by: garciadeblas --- Makefile | 2 +- models/yang/instantiation-parameters.yang | 2 +- models/yang/mano-types.yang | 8 +++--- .../netslice-instantiation-parameters.yang | 2 +- models/yang/nsd-base.yang | 2 +- models/yang/nsd.yang | 2 +- models/yang/nsi.yang | 8 +++--- models/yang/nsr.yang | 28 +++++++++---------- models/yang/nst.yang | 2 +- .../{rw-project.yang => osm-project.yang} | 6 ++-- models/yang/project-nsd.yang | 12 ++++---- models/yang/project-vnfd.yang | 8 +++--- models/yang/vlr.yang | 12 ++++---- models/yang/vnfd-base.yang | 2 +- models/yang/vnfd.yang | 2 +- models/yang/vnffgd.yang | 8 +++--- models/yang/vnfr.yang | 8 +++--- 17 files changed, 57 insertions(+), 57 deletions(-) rename models/yang/{rw-project.yang => osm-project.yang} (95%) diff --git a/Makefile b/Makefile index 6913a99..7c41b11 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ $(TREES_DIR): %.rec.html: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/rw-project.yang $(MODEL_DIR)/$*.yang + $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/osm-project.yang $(MODEL_DIR)/$*.yang $(Q)sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://osm.etsi.org/images/OSM-logo.png\" width=\"175\" height=\"60|g' $(TREES_DIR)/$@ $(Q)sed -r -i 's|||g' $(TREES_DIR)/$@ $(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.html diff --git a/models/yang/instantiation-parameters.yang b/models/yang/instantiation-parameters.yang index f39a1ab..0417bef 100644 --- a/models/yang/instantiation-parameters.yang +++ b/models/yang/instantiation-parameters.yang @@ -21,7 +21,7 @@ module instantiation-parameters { //header information yang-version 1; - namespace "urn:ietf:params:xml:ns:yang:nfvo:instantiation-parameters"; + namespace "urn:etsi:osm:yang:instantiation-parameters"; prefix "instantiation-parameters"; import nsd { diff --git a/models/yang/mano-types.yang b/models/yang/mano-types.yang index d34a9c5..df29868 100644 --- a/models/yang/mano-types.yang +++ b/models/yang/mano-types.yang @@ -20,15 +20,15 @@ module mano-types { - namespace "urn:ietf:params:xml:ns:yang:nfvo:mano-types"; + namespace "urn:etsi:osm:yang:mano-types"; prefix "manotypes"; import ietf-inet-types { prefix "inet"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } revision 2017-02-08 { @@ -2304,7 +2304,7 @@ module mano-types description "Project to which this belongs"; type leafref { - path "/rw-project:project/rw-project:name"; + path "/osm-project:project/osm-project:name"; } } } diff --git a/models/yang/netslice-instantiation-parameters.yang b/models/yang/netslice-instantiation-parameters.yang index 3a6ae9b..202068a 100644 --- a/models/yang/netslice-instantiation-parameters.yang +++ b/models/yang/netslice-instantiation-parameters.yang @@ -21,7 +21,7 @@ module netslice-instantiation-parameters { //header information yang-version 1; - namespace "urn:ietf:params:xml:ns:yang:nfvo:netslice-instantiation-parameters"; + namespace "urn:etsi:osm:yang:netslice-instantiation-parameters"; prefix "netslice-instantiation-parameters"; import nsd { diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang index 42cc0fc..894b7a5 100644 --- a/models/yang/nsd-base.yang +++ b/models/yang/nsd-base.yang @@ -20,7 +20,7 @@ module nsd-base { - namespace "http://riftio.com/ns/riftware-1.0/nsd-base"; + namespace "urn:etsi:osm:yang:nsd-base"; prefix "nsd-base"; import ietf-inet-types { diff --git a/models/yang/nsd.yang b/models/yang/nsd.yang index 19aebe9..47baf6f 100644 --- a/models/yang/nsd.yang +++ b/models/yang/nsd.yang @@ -20,7 +20,7 @@ module nsd { - namespace "urn:ietf:params:xml:ns:yang:nfvo:nsd"; + namespace "urn:etsi:osm:yang:nsd"; prefix "nsd"; import vnfd { diff --git a/models/yang/nsi.yang b/models/yang/nsi.yang index 06fe5a1..5953f2a 100644 --- a/models/yang/nsi.yang +++ b/models/yang/nsi.yang @@ -21,7 +21,7 @@ module nsi { //header information yang-version 1; - namespace "urn:ietf:params:xml:ns:yang:nfvo:nsi"; + namespace "urn:etsi:osm:yang:nsi"; prefix "nsi"; import nst { @@ -32,8 +32,8 @@ module nsi { prefix "nsr"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } import netslice-instantiation-parameters { @@ -93,7 +93,7 @@ module nsi { description "Reference to instantiated NSR"; config false; type leafref { - path "/rw-project:project/nsr:ns-instance-opdata/nsr:nsr/nsr:ns-instance-config-ref"; + path "/osm-project:project/nsr:ns-instance-opdata/nsr:nsr/nsr:ns-instance-config-ref"; } } } diff --git a/models/yang/nsr.yang b/models/yang/nsr.yang index 520252b..e2a4d6f 100644 --- a/models/yang/nsr.yang +++ b/models/yang/nsr.yang @@ -20,7 +20,7 @@ module nsr { - namespace "urn:ietf:params:xml:ns:yang:nfvo:nsr"; + namespace "urn:etsi:osm:yang:nsr"; prefix "nsr"; import vlr { @@ -55,8 +55,8 @@ module nsr prefix "manotypes"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } revision 2017-02-08 { @@ -161,7 +161,7 @@ module nsr } } - augment "/rw-project:project" { + augment "/osm-project:project" { list key-pair { key "name"; description "Used to configure the list of public keys to be injected as part @@ -210,7 +210,7 @@ module nsr } } - augment "/rw-project:project" { + augment "/osm-project:project" { container ns-instance-config { list nsr { @@ -640,7 +640,7 @@ module nsr } } - augment "/rw-project:project" { + augment "/osm-project:project" { container ns-instance-opdata { config false; @@ -1160,7 +1160,7 @@ module nsr leaf nsr_id_ref { description "Reference to NSR ID ref"; type leafref { - path "/rw-project:project[rw-project:name=current()/.." + + path "/osm-project:project[osm-project:name=current()/.." + "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr/nsr:id"; } mandatory true; @@ -1460,7 +1460,7 @@ module nsr leaf scaling-group-name-ref { description "name of the scaling group"; type leafref { - path "/rw-project:project[rw-project:name=current()/.." + + path "/osm-project:project[osm-project:name=current()/.." + "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" + "[nsr:id=current()/../nsr:nsr_id_ref]/nsr:nsd" + "/nsr:scaling-group-descriptor/nsr:name"; @@ -1471,7 +1471,7 @@ module nsr leaf instance-id { description "id of the scaling group"; type leafref { - path "/rw-project:project[rw-project:name=current()/.." + + path "/osm-project:project[osm-project:name=current()/.." + "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" + "[nsr:id=current()/../nsr:nsr_id_ref]" + "/nsr:scaling-group[nsr:scaling-group-name-ref=current()/.." + @@ -1499,7 +1499,7 @@ module nsr leaf scaling-group-name-ref { description "name of the scaling group"; type leafref { - path "/rw-project:project[rw-project:name=current()/.." + + path "/osm-project:project[osm-project:name=current()/.." + "/nsr:project-name]/nsr:ns-instance-config/nsr:nsr" + "[nsr:id=current()/../nsr:nsr_id_ref]/nsr:nsd" + "/nsr:scaling-group-descriptor/nsr:name"; @@ -1535,7 +1535,7 @@ module nsr leaf nsd_id_ref { description "Reference to NSD ID ref"; type leafref { - path "/rw-project:project[rw-project:name=current()/.." + + path "/osm-project:project[osm-project:name=current()/.." + "/project-name]/project-nsd:nsd-catalog/project-nsd:nsd/project-nsd:id"; } } @@ -1567,7 +1567,7 @@ module nsr description "A reference to VNFD placement group"; type leafref { - path "/rw-project:project[rw-project:name=current()/" + + path "/osm-project:project[osm-project:name=current()/" + "../../project-name]/project-vnfd:vnfd-catalog/project-vnfd:vnfd[project-vnfd:id = " + "current()/../vnfd-id-ref]/project-vnfd:placement-groups/project-vnfd:name"; } @@ -1583,7 +1583,7 @@ module nsr leaf key-pair-ref { description "A reference to the key pair entry in the global key pair table"; type leafref { - path "/rw-project:project[rw-project:name=current()/../../../" + + path "/osm-project:project[osm-project:name=current()/../../../" + "project-name]/key-pair/name"; } } @@ -1610,7 +1610,7 @@ module nsr leaf key-pair-ref { description "A reference to the key pair entry in the global key pair table"; type leafref { - path "/rw-project:project[rw-project:name=current()/" + + path "/osm-project:project[osm-project:name=current()/" + "../../../../project-name]/key-pair/name"; } } diff --git a/models/yang/nst.yang b/models/yang/nst.yang index c95a258..059d5dd 100644 --- a/models/yang/nst.yang +++ b/models/yang/nst.yang @@ -21,7 +21,7 @@ module nst { //header information yang-version 1; - namespace "urn:ietf:params:xml:ns:yang:nfvo:nst"; + namespace "urn:etsi:osm:yang:nst"; prefix "nst"; import nsd-base{ diff --git a/models/yang/rw-project.yang b/models/yang/osm-project.yang similarity index 95% rename from models/yang/rw-project.yang rename to models/yang/osm-project.yang index 4c9d5cb..e98da34 100644 --- a/models/yang/rw-project.yang +++ b/models/yang/osm-project.yang @@ -14,10 +14,10 @@ * limitations under the License. */ -module rw-project +module osm-project { - namespace "http://riftio.com/ns/riftware-1.0/rw-project"; - prefix "rw-project"; + namespace "urn:etsi:osm:yang:osm-project"; + prefix "osm-project"; description "This yang module defines project-based tenancy for RIFT.ware. diff --git a/models/yang/project-nsd.yang b/models/yang/project-nsd.yang index ace4102..bf0ac38 100644 --- a/models/yang/project-nsd.yang +++ b/models/yang/project-nsd.yang @@ -20,7 +20,7 @@ module project-nsd { - namespace "http://riftio.com/ns/riftware-1.0/project-nsd"; + namespace "urn:etsi:osm:yang:project-nsd"; prefix "project-nsd"; import mano-types { @@ -35,8 +35,8 @@ module project-nsd prefix "nsd-base"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } @@ -70,7 +70,7 @@ module project-nsd description "Identifier for the VNFD."; type leafref { - path "/rw-project:project[rw-project:name = current()/../../../../rw-project:name]" + + path "/osm-project:project[osm-project:name = current()/../../../../osm-project:name]" + "/project-vnfd:vnfd-catalog/project-vnfd:vnfd/project-vnfd:id"; } } @@ -104,7 +104,7 @@ module project-nsd description "Identifier for the VNFD."; type leafref { - path "/rw-project:project[rw-project:name = current()/../../../../../rw-project:name]" + + path "/osm-project:project[osm-project:name = current()/../../../../../osm-project:name]" + "/project-vnfd:vnfd-catalog/project-vnfd:vnfd/project-vnfd:id"; } } @@ -587,7 +587,7 @@ module project-nsd uses nsd-service-primitive; } - augment "/rw-project:project" { + augment "/osm-project:project" { container nsd-catalog { list nsd { diff --git a/models/yang/project-vnfd.yang b/models/yang/project-vnfd.yang index 5342436..11af238 100644 --- a/models/yang/project-vnfd.yang +++ b/models/yang/project-vnfd.yang @@ -20,11 +20,11 @@ module project-vnfd { - namespace "http://riftio.com/ns/riftware-1.0/project-vnfd"; + namespace "urn:etsi:osm:yang:project-vnfd"; prefix "project-vnfd"; - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } import vnfd-base { @@ -40,7 +40,7 @@ module project-vnfd "Derived from earlier versions of base YANG files"; } - augment /rw-project:project { + augment /osm-project:project { container vnfd-catalog { description "Virtual Network Function Descriptor (VNFD)."; diff --git a/models/yang/vlr.yang b/models/yang/vlr.yang index 9137539..31b9401 100644 --- a/models/yang/vlr.yang +++ b/models/yang/vlr.yang @@ -20,7 +20,7 @@ module vlr { - namespace "urn:ietf:params:xml:ns:yang:nfvo:vlr"; + namespace "urn:etsi:osm:yang:vlr"; prefix "vlr"; import ietf-yang-types { @@ -31,8 +31,8 @@ module vlr prefix "manotypes"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } revision 2017-02-08 { @@ -48,7 +48,7 @@ module vlr "Derived from earlier versions of base YANG files"; } - augment "/rw-project:project" { + augment "/osm-project:project" { container vlr-catalog { leaf schema-version { description "Schema version for the VLR. If unspecified, it assumes v3.0"; @@ -75,14 +75,14 @@ module vlr leaf nsr-id-ref { description "NS instance identifier. - This is a leafref /rw-project:project/nsr:ns-instance-config/nsr:nsr/nsr:id"; + This is a leafref /osm-project:project/nsr:ns-instance-config/nsr:nsr/nsr:id"; type yang:uuid; } leaf vld-ref { description "Reference to VLD - /rw-project:project/nsr:ns-instance-config/nsr:nsr[nsr:id=../nsr-id-ref] + /osm-project:project/nsr:ns-instance-config/nsr:nsr[nsr:id=../nsr-id-ref] /nsd/vld:vld/vld:id"; type string; } diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang index f176811..0cd8e45 100644 --- a/models/yang/vnfd-base.yang +++ b/models/yang/vnfd-base.yang @@ -20,7 +20,7 @@ module vnfd-base { - namespace "http://riftio.com/ns/riftware-1.0/vnfd-base"; + namespace "urn:etsi:osm:yang:vnfd-base"; prefix "vnfd-base"; import mano-types { diff --git a/models/yang/vnfd.yang b/models/yang/vnfd.yang index f1229e7..8c29fb7 100644 --- a/models/yang/vnfd.yang +++ b/models/yang/vnfd.yang @@ -20,7 +20,7 @@ module vnfd { - namespace "urn:ietf:params:xml:ns:yang:nfvo:vnfd"; + namespace "urn:etsi:osm:yang:vnfd"; prefix "vnfd"; import vnfd-base { diff --git a/models/yang/vnffgd.yang b/models/yang/vnffgd.yang index 652ee81..811bc64 100644 --- a/models/yang/vnffgd.yang +++ b/models/yang/vnffgd.yang @@ -20,15 +20,15 @@ module vnffgd { - namespace "urn:ietf:params:xml:ns:yang:nfvo:vnffgd"; + namespace "urn:etsi:osm:yang:vnffgd"; prefix "vnffgd"; import ietf-yang-types { prefix "yang"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } revision 2017-02-08 { @@ -44,7 +44,7 @@ module vnffgd "Derived from earlier versions of base YANG files"; } - augment "/rw-project:project" { + augment "/osm-project:project" { container vnffgd-catalog { list vnffgd { diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang index 8813647..7a0594b 100644 --- a/models/yang/vnfr.yang +++ b/models/yang/vnfr.yang @@ -20,7 +20,7 @@ module vnfr { - namespace "urn:ietf:params:xml:ns:yang:nfvo:vnfr"; + namespace "urn:etsi:osm:yang:vnfr"; prefix "vnfr"; import mano-types { @@ -51,8 +51,8 @@ module vnfr prefix "inet"; } - import rw-project { - prefix "rw-project"; + import osm-project { + prefix "osm-project"; } revision 2017-02-28 { @@ -197,7 +197,7 @@ module vnfr } } - augment "/rw-project:project" { + augment "/osm-project:project" { container vnfr-catalog { leaf schema-version { description "Schema version for the VNFR. If unspecified, it assumes v3.0"; -- 2.25.1