Commit 1a7101d9 authored by jethanandani's avatar jethanandani
Browse files

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

Bug#252

See merge request !49
parents a342a58a 2ec0a0f9

example-data/nfv-nsd.xml

+134 −150
Original line number Original line Diff line number Diff line 
<?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">

  <nfv xmlns="urn:etsi:nfv:yang:etsi-nfv-descriptors">

  <vnfd>

  <vnfd>

    <id>ASA</id>

    <id>ASA</id>

    <provider>My Company</provider>

    <provider>My Company</provider>
@@ -13,15 +11,15 @@ 
      <name>Firewall VDU</name>

      <name>Firewall VDU</name>

      <int-cpd>

      <int-cpd>

        <id>inside</id>

        <id>inside</id>

          <layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>management</id>

        <id>management</id>

          <layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <int-cpd>

      <int-cpd>

        <id>outside</id>

        <id>outside</id>

          <layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

      </int-cpd>

      </int-cpd>

      <virtual-compute-desc>asa-vcd</virtual-compute-desc>

      <virtual-compute-desc>asa-vcd</virtual-compute-desc>

      <virtual-storage-desc>asa-vsd</virtual-storage-desc>

      <virtual-storage-desc>asa-vsd</virtual-storage-desc>
@@ -38,7 +36,7 @@ 
    </virtual-compute-desc>

    </virtual-compute-desc>

    <virtual-storage-desc>

    <virtual-storage-desc>

      <id>asa-vsd</id>

      <id>asa-vsd</id>

	<type-of-storage>root-storage</type-of-storage>

    <type-of-storage xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:root-storage</type-of-storage>

      <size-of-storage>0</size-of-storage>

      <size-of-storage>0</size-of-storage>

    </virtual-storage-desc>

    </virtual-storage-desc>

    <sw-image-desc>

    <sw-image-desc>
@@ -46,15 +44,15 @@ 
      <name>ASA image</name>

      <name>ASA image</name>

      <version>1.1</version>

      <version>1.1</version>

      <checksum>

      <checksum>

	  <algorithm>sha-224</algorithm>

	<algorithm xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:sha-224</algorithm>

	<hash>deadbeef</hash>

	<hash>deadbeef</hash>

      </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://mycompany.images.com/asa.qcow2</image>

      <image>http://www.cisco.com/asa.qcow2</image>

    </sw-image-desc>

    </sw-image-desc>

    <ext-cpd>

    <ext-cpd>

      <id>inside</id>

      <id>inside</id>
@@ -62,7 +60,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>inside</cpd>

	<cpd>inside</cpd>

      </int-cpd>

      </int-cpd>

	<layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>management</id>

      <id>management</id>
@@ -70,7 +68,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>management</cpd>

	<cpd>management</cpd>

      </int-cpd>

      </int-cpd>

	<layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <ext-cpd>

    <ext-cpd>

      <id>outside</id>

      <id>outside</id>
@@ -78,7 +76,7 @@ 
	<vdu-id>firewall</vdu-id>

	<vdu-id>firewall</vdu-id>

	<cpd>outside</cpd>

	<cpd>outside</cpd>

      </int-cpd>

      </int-cpd>

	<layer-protocol>ethernet</layer-protocol>

      <layer-protocol xmlns:nfv="urn:etsi:nfv:yang:etsi-nfv-descriptors">nfv:ethernet</layer-protocol>

    </ext-cpd>

    </ext-cpd>

    <df>

    <df>

      <id>normal</id>

      <id>normal</id>
@@ -102,21 +100,8 @@ 
        </vdu-level>

        </vdu-level>

      </instantiation-level>

      </instantiation-level>

      <default-instantiation-level>single</default-instantiation-level>

      <default-instantiation-level>single</default-instantiation-level>

	<lcm-operations-configuration>

	  <scale-vnf-to-level-op-config>

	    <arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>

	  </scale-vnf-to-level-op-config>

	  <terminate-vnf-op-config>

	    <min-graceful-termination>1</min-graceful-termination>

	  </terminate-vnf-op-config>

	  <operate-vnf-op-config>

	    <min-graceful-stop-timeout>1</min-graceful-stop-timeout>

	  </operate-vnf-op-config>

	</lcm-operations-configuration>

    </df>

    </df>

  </vnfd>

  </vnfd>

  </nfv>

  <nsd xmlns="urn:etsi:nfv:yang:etsi-nfv-nsd">

  <nsd>

  <nsd>

    <id>firewall-nsd</id>

    <id>firewall-nsd</id>

    <vnfd-id>ASA</vnfd-id>

    <vnfd-id>ASA</vnfd-id>
@@ -148,5 +133,4 @@ 
      </ns-instantiation-level>

      </ns-instantiation-level>

    </df>

    </df>

  </nsd>

  </nsd>

  </nsd>

</config>
 
</config>

example-data/nfv-vnfd.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>

example-data/nfv.xml

+35 −4
Original line number Original line Diff line number Diff line
@@ -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 @@ 
        <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>

src/README

0 → 100644
+36 −0
Original line number Original line Diff line number Diff line 
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

src/sol006-metadata.json

0 → 100644
+134 −0
Original line number Original line Diff line number Diff line 
{

    "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"

                }

	    }

        ]

    }

}