diff --git a/example-data/nfv-nsd.xml b/example-data/nfv-nsd.xml
index 85d14555a4725517282eac587e58ba387e7806b0..cc2c70a15ea6a4057b359958fcc89788b9edeee9 100644
--- a/example-data/nfv-nsd.xml
+++ b/example-data/nfv-nsd.xml
@@ -1,152 +1,136 @@
-
-
-
-
- ASA
- My Company
- My Company ASAv
- 9.8
- 9.8
- My Company Vnfm
-
- firewall
- Firewall VDU
-
- inside
- ethernet
-
-
- management
- ethernet
-
-
- outside
- ethernet
-
- asa-vcd
- asa-vsd
- asa-image
-
-
- asa-vcd
-
- 4.0
-
-
- 2
-
-
-
- asa-vsd
- root-storage
- 0
-
-
- asa-image
- ASA image
- 1.1
-
- sha-224
- deadbeef
-
- bare
- qcow2
- 1
- 2.0
- 1
- http://mycompany.images.com/asa.qcow2
-
-
- inside
-
- firewall
- inside
-
- ethernet
-
-
- management
-
- firewall
- management
-
- ethernet
-
-
- outside
-
- firewall
- outside
-
- ethernet
-
-
- normal
-
- firewall
- 1
- 2
-
-
- double
-
- firewall
- 2
-
-
-
- single
-
- firewall
- 1
-
-
- single
-
-
- true
-
-
- 1
-
-
- 1
-
-
-
-
-
-
-
- firewall-nsd
- ASA
-
- inside
-
-
- management
-
-
- outside
-
-
- firewall
-
- firewall
- ASA
- normal
- single
- 1
- 1
-
-
- single
-
- firewall
- 1
-
-
-
-
+
+
+ ASA
+ My Company
+ My Company ASAv
+ 9.8
+ 9.8
+ My Company Vnfm
+
+ firewall
+ Firewall VDU
+
+ inside
+ nfv:ethernet
+
+
+ management
+ nfv:ethernet
+
+
+ outside
+ nfv:ethernet
+
+ asa-vcd
+ asa-vsd
+ asa-image
+
+
+ asa-vcd
+
+ 4.0
+
+
+ 2
+
+
+
+ asa-vsd
+ nfv:root-storage
+ 0
+
+
+ asa-image
+ ASA image
+ 1.1
+
+ nfv:sha-224
+ deadbeef
+
+ bare
+ qcow2
+ 20
+ 2.0
+ 1
+ http://www.cisco.com/asa.qcow2
+
+
+ inside
+
+ firewall
+ inside
+
+ nfv:ethernet
+
+
+ management
+
+ firewall
+ management
+
+ nfv:ethernet
+
+
+ outside
+
+ firewall
+ outside
+
+ nfv:ethernet
+
+
+ normal
+
+ firewall
+ 1
+ 2
+
+
+ double
+
+ firewall
+ 2
+
+
+
+ single
+
+ firewall
+ 1
+
+
+ single
+
+
+
+ firewall-nsd
+ ASA
+
+ inside
+
+
+ management
+
+
+ outside
+
+
+ firewall
+
+ firewall
+ ASA
+ normal
+ single
+ 1
+ 1
+
+
+ single
+
+ firewall
+ 1
+
+
+
diff --git a/example-data/nfv-vnfd.xml b/example-data/nfv-vnfd.xml
index 6b76c43495c7e6490901dfaeaa4cdc59733d4a26..0fcf5b6a1c17eee3c7b791405e49122ed5187840 100644
--- a/example-data/nfv-vnfd.xml
+++ b/example-data/nfv-vnfd.xml
@@ -48,7 +48,7 @@
bare
qcow2
- 1
+ 20
2.0
1
http://www.cisco.com/asa.qcow2
diff --git a/example-data/nfv.xml b/example-data/nfv.xml
index 92731014a95ae724ed26a40eb703cf7928f157c3..fef928e79c8de820afadfe5e03f5d361336dbe21 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
diff --git a/src/README b/src/README
new file mode 100644
index 0000000000000000000000000000000000000000..d2defdfd7e0036179b81d24bf9739945209a53b9
--- /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 0000000000000000000000000000000000000000..038878b8311aae81f0c5baa9fa523b8b72163c64
--- /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-03-18",
+ "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-03-18",
+ "source-file": {
+ "owner": "YangModels",
+ "path": "standard/etsi/SOL006/src/yang/etsi-nfv-vnfd.yang",
+ "repository": "yang"
+ }
+ }
+ ]
+ }
+}