Commit 1a7101d9 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'bug#252' into 'v2.7.1'

Bug#252

See merge request !49
parents a342a58a 2ec0a0f9
Pipeline #1622 passed with stage
in 0 seconds
<?xml version="1.0" encoding="UTF-8"?> <nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">
<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> <vnfd>
<nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors"> <id>ASA</id>
<vnfd> <provider>My Company</provider>
<id>ASA</id> <product-name>My Company ASAv</product-name>
<provider>My Company</provider> <software-version>9.8</software-version>
<product-name>My Company ASAv</product-name> <version>9.8</version>
<software-version>9.8</software-version> <vnfm-info>My Company Vnfm</vnfm-info>
<version>9.8</version> <vdu>
<vnfm-info>My Company Vnfm</vnfm-info> <id>firewall</id>
<vdu> <name>Firewall VDU</name>
<id>firewall</id> <int-cpd>
<name>Firewall VDU</name> <id>inside</id>
<int-cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
<id>inside</id> </int-cpd>
<layer-protocol>ethernet</layer-protocol> <int-cpd>
</int-cpd> <id>management</id>
<int-cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
<id>management</id> </int-cpd>
<layer-protocol>ethernet</layer-protocol> <int-cpd>
</int-cpd> <id>outside</id>
<int-cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
<id>outside</id> </int-cpd>
<layer-protocol>ethernet</layer-protocol> <virtual-compute-desc>asa-vcd</virtual-compute-desc>
</int-cpd> <virtual-storage-desc>asa-vsd</virtual-storage-desc>
<virtual-compute-desc>asa-vcd</virtual-compute-desc> <sw-image-desc>asa-image</sw-image-desc>
<virtual-storage-desc>asa-vsd</virtual-storage-desc> </vdu>
<sw-image-desc>asa-image</sw-image-desc> <virtual-compute-desc>
</vdu> <id>asa-vcd</id>
<virtual-compute-desc> <virtual-memory>
<id>asa-vcd</id> <size>4.0</size>
<virtual-memory> </virtual-memory>
<size>4.0</size> <virtual-cpu>
</virtual-memory> <num-virtual-cpu>2</num-virtual-cpu>
<virtual-cpu> </virtual-cpu>
<num-virtual-cpu>2</num-virtual-cpu> </virtual-compute-desc>
</virtual-cpu> <virtual-storage-desc>
</virtual-compute-desc> <id>asa-vsd</id>
<virtual-storage-desc> <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>
<id>asa-vsd</id> <size-of-storage>0</size-of-storage>
<type-of-storage>root-storage</type-of-storage> </virtual-storage-desc>
<size-of-storage>0</size-of-storage> <sw-image-desc>
</virtual-storage-desc> <id>asa-image</id>
<sw-image-desc> <name>ASA image</name>
<id>asa-image</id> <version>1.1</version>
<name>ASA image</name> <checksum>
<version>1.1</version> <algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>
<checksum> <hash>deadbeef</hash>
<algorithm>sha-224</algorithm> </checksum>
<hash>deadbeef</hash> <container-format>bare</container-format>
</checksum> <disk-format>qcow2</disk-format>
<container-format>bare</container-format> <min-disk>20</min-disk>
<disk-format>qcow2</disk-format> <min-ram>2.0</min-ram>
<min-disk>1</min-disk> <size>1</size>
<min-ram>2.0</min-ram> <image>http://www.cisco.com/asa.qcow2</image>
<size>1</size> </sw-image-desc>
<image>http://mycompany.images.com/asa.qcow2</image> <ext-cpd>
</sw-image-desc> <id>inside</id>
<ext-cpd> <int-cpd>
<id>inside</id> <vdu-id>firewall</vdu-id>
<int-cpd> <cpd>inside</cpd>
<vdu-id>firewall</vdu-id> </int-cpd>
<cpd>inside</cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
</int-cpd> </ext-cpd>
<layer-protocol>ethernet</layer-protocol> <ext-cpd>
</ext-cpd> <id>management</id>
<ext-cpd> <int-cpd>
<id>management</id> <vdu-id>firewall</vdu-id>
<int-cpd> <cpd>management</cpd>
<vdu-id>firewall</vdu-id> </int-cpd>
<cpd>management</cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
</int-cpd> </ext-cpd>
<layer-protocol>ethernet</layer-protocol> <ext-cpd>
</ext-cpd> <id>outside</id>
<ext-cpd> <int-cpd>
<id>outside</id> <vdu-id>firewall</vdu-id>
<int-cpd> <cpd>outside</cpd>
<vdu-id>firewall</vdu-id> </int-cpd>
<cpd>outside</cpd> <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>
</int-cpd> </ext-cpd>
<layer-protocol>ethernet</layer-protocol> <df>
</ext-cpd> <id>normal</id>
<df> <vdu-profile>
<id>normal</id> <id>firewall</id>
<vdu-profile> <min-number-of-instances>1</min-number-of-instances>
<id>firewall</id> <max-number-of-instances>2</max-number-of-instances>
<min-number-of-instances>1</min-number-of-instances> </vdu-profile>
<max-number-of-instances>2</max-number-of-instances> <instantiation-level>
</vdu-profile> <id>double</id>
<instantiation-level> <vdu-level>
<id>double</id> <vdu-id>firewall</vdu-id>
<vdu-level> <number-of-instances>2</number-of-instances>
<vdu-id>firewall</vdu-id> </vdu-level>
<number-of-instances>2</number-of-instances> </instantiation-level>
</vdu-level> <instantiation-level>
</instantiation-level> <id>single</id>
<instantiation-level> <vdu-level>
<id>single</id> <vdu-id>firewall</vdu-id>
<vdu-level> <number-of-instances>1</number-of-instances>
<vdu-id>firewall</vdu-id> </vdu-level>
<number-of-instances>1</number-of-instances> </instantiation-level>
</vdu-level> <default-instantiation-level>single</default-instantiation-level>
</instantiation-level> </df>
<default-instantiation-level>single</default-instantiation-level> </vnfd>
<lcm-operations-configuration> <nsd>
<scale-vnf-to-level-op-config> <id>firewall-nsd</id>
<arbitrary-target-levels-supported>true</arbitrary-target-levels-supported> <vnfd-id>ASA</vnfd-id>
</scale-vnf-to-level-op-config> <sapd>
<terminate-vnf-op-config> <id>inside</id>
<min-graceful-termination>1</min-graceful-termination> </sapd>
</terminate-vnf-op-config> <sapd>
<operate-vnf-op-config> <id>management</id>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout> </sapd>
</operate-vnf-op-config> <sapd>
</lcm-operations-configuration> <id>outside</id>
</df> </sapd>
</vnfd> <df>
</nfv> <id>firewall</id>
<nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd"> <vnf-profile>
<nsd> <id>firewall</id>
<id>firewall-nsd</id> <vnfd-id>ASA</vnfd-id>
<vnfd-id>ASA</vnfd-id> <flavour-id>normal</flavour-id>
<sapd> <instantiation-level>single</instantiation-level>
<id>inside</id> <min-number-of-instances>1</min-number-of-instances>
</sapd> <max-number-of-instances>1</max-number-of-instances>
<sapd> </vnf-profile>
<id>management</id> <ns-instantiation-level>
</sapd> <id>single</id>
<sapd> <vnf-to-level-mapping>
<id>outside</id> <vnf-profile-id>firewall</vnf-profile-id>
</sapd> <number-of-instances>1</number-of-instances>
<df> </vnf-to-level-mapping>
<id>firewall</id> </ns-instantiation-level>
<vnf-profile> </df>
<id>firewall</id>
<vnfd-id>ASA</vnfd-id>
<flavour-id>normal</flavour-id>
<instantiation-level>single</instantiation-level>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
</vnf-profile>
<ns-instantiation-level>
<id>single</id>
<vnf-to-level-mapping>
<vnf-profile-id>firewall</vnf-profile-id>
<number-of-instances>1</number-of-instances>
</vnf-to-level-mapping>
</ns-instantiation-level>
</df>
</nsd>
</nsd> </nsd>
</config> </config>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</checksum> </checksum>
<container-format>bare</container-format> <container-format>bare</container-format>
<disk-format>qcow2</disk-format> <disk-format>qcow2</disk-format>
<min-disk>1</min-disk> <min-disk>20</min-disk>
<min-ram>2.0</min-ram> <min-ram>2.0</min-ram>
<size>1</size> <size>1</size>
<image>http://www.cisco.com/asa.qcow2</image> <image>http://www.cisco.com/asa.qcow2</image>
......
...@@ -54,12 +54,23 @@ ...@@ -54,12 +54,23 @@
<size>1</size> <size>1</size>
<image>http://mycompany.images.com/asa.qcow2</image> <image>http://mycompany.images.com/asa.qcow2</image>
</sw-image-desc> </sw-image-desc>
<int-virtual-link-desc>
<id>inside-vl</id>
<flavour>
<id>1g</id>
<qos>
<latency>1</latency>
<packet-delay-variation>1</packet-delay-variation>
<packet-loss-ratio>0.02</packet-loss-ratio>
</qos>
</flavour>
<connectivity-type>
<layer-protocol>ethernet</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<ext-cpd> <ext-cpd>
<id>inside</id> <id>inside</id>
<int-cpd> <int-virtual-link-desc>inside-vl</int-virtual-link-desc>
<vdu-id>firewall</vdu-id>
<cpd>inside</cpd>
</int-cpd>
<layer-protocol>ethernet</layer-protocol> <layer-protocol>ethernet</layer-protocol>
</ext-cpd> </ext-cpd>
<ext-cpd> <ext-cpd>
...@@ -85,6 +96,26 @@ ...@@ -85,6 +96,26 @@
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-number-of-instances> <max-number-of-instances>2</max-number-of-instances>
</vdu-profile> </vdu-profile>
<virtual-link-profile>
<id>inside-vl</id>
<flavour>1g</flavour>
<max-bit-rate-requirements>
<root>10</root>
</max-bit-rate-requirements>
<min-bit-rate-requirements>
<root>1</root>
</min-bit-rate-requirements>
<virtual-link-protocol-data>
<associated-layer-protocol>ipv4</associated-layer-protocol>
<l3-protocol-data>
<name>inside-network</name>
<ip-version>ipv4</ip-version>
<cidr>192.138.0.0/8</cidr>
<gateway-ip>192.138.0.1</gateway-ip>
<dhcp-enabled>true</dhcp-enabled>
</l3-protocol-data>
</virtual-link-protocol-data>
</virtual-link-profile>
<instantiation-level> <instantiation-level>
<id>double</id> <id>double</id>
<vdu-level> <vdu-level>
......
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 <username>:<password> -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/<job-id>
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
{
"modules": {
"module": [
{
"author-email": "pnns@etsi.org",
"document-name": "NFV descriptors based on YANG specification <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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 <https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/006/02.06.01_60/gs_nfv-sol006v020601p.pdf>",
"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"
}
}
]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment