From f24a46b578139da1f59d240dbe1a533004cf0e1e Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Mon, 29 Jul 2019 11:13:45 -0700 Subject: [PATCH 1/3] Adding metadata file for yangcatalog --- src/README | 36 +++++++++++ src/sol006-metadata.json | 134 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) create mode 100644 src/README create mode 100644 src/sol006-metadata.json diff --git a/src/README b/src/README new file mode 100644 index 0000000..d2defdf --- /dev/null +++ b/src/README @@ -0,0 +1,36 @@ +This README explains how the sol006-metadata.json file is used to populate +information in yangcatalog.org + +This JSON file has been created using the example file described here. Note, +the first two lines in the example are really for putting on the command +line, and not be included in the JSON file. + +Once the file has been populated, the following command should be used to +upload the metadata into the YANG Catalog. + +curl -X PUT -u : -H "Content-type: application/json" https://yangcatalog.org/api/modules --upload-file sol006-metadata.json + +where the 'username' and 'password' can be requested at +https://yangcatalog.org/create.html. + +A successfule submission should result in an output that gives a job-id +like this: + +{"info":"Verification successful","job-id":"75883423-a6b7-4e9e-94ad-0983a0a8cac7"} + +Use the following link to verify the status of the job: + +https://yangcatalog.org/api/job/ + +If the submission is in progress, expect an output as follows: + +{"info":{"job-id":"7b7f3436-34e9-4947-aa60-402102cdff05","reason":null,"result":"In progress\n"}} + +and once it is complete, and the submission fails, expect an output as +follows: + +{"info":{"job-id":"7b7f3436-34e9-4947-aa60-402102cdff05","reason":null,"result":"Failed\n"}} + +Or if it is successful expect an output like this: + +{"info":{"job-id":"75883423-a6b7-4e9e-94ad-0983a0a8cac7","reason":null,"result":"Finished successfully\n"}} \ No newline at end of file diff --git a/src/sol006-metadata.json b/src/sol006-metadata.json new file mode 100644 index 0000000..f788ba9 --- /dev/null +++ b/src/sol006-metadata.json @@ -0,0 +1,134 @@ +{ + "modules": { + "module": [ + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-descriptors", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-descriptors.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-common", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-common.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-ns", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-ns.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-nsd", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-nsd.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-pnf", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-pnf.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-pnfd", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-pnfd.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-vnf", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-vnf.yang", + "repository": "yang" + } + }, + { + "author-email": "pnns@etsi.org", + "document-name": "NFV descriptors based on YANG specification ", + "generated-from": "not-applicable", + "maturity-level": "ratified", + "name": "etsi-nfv-vnfd", + "organization": "etsi", + "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", + "module-classification": "network-service", + "revision": "2019-04-25", + "source-file": { + "owner": "YangModels", + "path": "standard/etsi/SOL006/src/yang/etsi-nfv-vnfd.yang", + "repository": "yang" + } + } + ] + } +} -- GitLab From c10021841f5811189117a77f888cf21385f88a46 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Mon, 29 Jul 2019 12:55:27 -0700 Subject: [PATCH 2/3] Add the correct revision for vnf and vnfd. --- src/sol006-metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sol006-metadata.json b/src/sol006-metadata.json index f788ba9..038878b 100644 --- a/src/sol006-metadata.json +++ b/src/sol006-metadata.json @@ -106,7 +106,7 @@ "organization": "etsi", "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", "module-classification": "network-service", - "revision": "2019-04-25", + "revision": "2019-03-18", "source-file": { "owner": "YangModels", "path": "standard/etsi/SOL006/src/yang/etsi-nfv-vnf.yang", @@ -122,7 +122,7 @@ "organization": "etsi", "reference": "https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf", "module-classification": "network-service", - "revision": "2019-04-25", + "revision": "2019-03-18", "source-file": { "owner": "YangModels", "path": "standard/etsi/SOL006/src/yang/etsi-nfv-vnfd.yang", -- GitLab From 704420762b688a0765a5927a5e40728b6f9922e6 Mon Sep 17 00:00:00 2001 From: Mahesh Jethanandani Date: Mon, 16 Sep 2019 11:45:37 -0700 Subject: [PATCH 3/3] Bug#251 --- example-data/complex-vnfd.xml | 12 ++++------- example-data/nfv-nsd.xml | 1 + example-data/nfv-vnfd.xml | 1 + example-data/nfv.xml | 39 +++++++++++++++++++++++++++++++---- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/example-data/complex-vnfd.xml b/example-data/complex-vnfd.xml index b10ec9f..39bbbaf 100644 --- a/example-data/complex-vnfd.xml +++ b/example-data/complex-vnfd.xml @@ -78,11 +78,11 @@ 16 - + root root-storage 10 - + CP CP @@ -116,17 +116,13 @@ internal-vl - - ipv4 - + ipv4 mgmt - - ipv4 - + ipv4 diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml index ba4ec2d..0b2f6b9 100644 --- a/example-data/nfv-nsd.xml +++ b/example-data/nfv-nsd.xml @@ -49,6 +49,7 @@ bare qcow2 + 20 2.0 1 http://www.cisco.com/asa.qcow2 diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml index 7587240..0fcf5b6 100644 --- a/example-data/nfv-vnfd.xml +++ b/example-data/nfv-vnfd.xml @@ -48,6 +48,7 @@ bare qcow2 + 20 2.0 1 http://www.cisco.com/asa.qcow2 diff --git a/example-data/nfv.xml b/example-data/nfv.xml index 9273101..fef928e 100644 --- a/example-data/nfv.xml +++ b/example-data/nfv.xml @@ -54,12 +54,23 @@ 1 http://mycompany.images.com/asa.qcow2 + + inside-vl + + 1g + + 1 + 1 + 0.02 + + + + ethernet + + inside - - firewall - inside - + inside-vl ethernet @@ -85,6 +96,26 @@ 1 2 + + inside-vl + 1g + + 10 + + + 1 + + + ipv4 + + inside-network + ipv4 + 192.138.0.0/8 + 192.138.0.1 + true + + + double -- GitLab