Commit a4ee7816 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Fixed company names and URL for image path.

parent 094395a0
<config xmlns="http://tail-f.com/ns/config/1.0"> <nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv">
<nfv xmlns="urn:etsi:params:xml:ns:yang:etsi-nfv"> <vnfd>
<vnfd> <id>complex-vnf</id>
<id>complex-vnf</id> <provider>My Company</provider>
<provider>ACME</provider> <product-name>complex-vnf</product-name>
<product-name>complex-vnf</product-name> <software-version>1.0</software-version>
<software-version>1.0</software-version> <version>1.0</version>
<version>1.0</version> <vnfm-info>netconf</vnfm-info>
<vnfm-info>netconf</vnfm-info> <vdu>
<vdu> <id>control-plane-active</id>
<id>control-plane-active</id> <name>control-plane-active</name>
<name>control-plane-active</name> <int-cpd>
<int-cpd> <id>internal</id>
<id>internal</id> <int-virtual-link-desc>internal-vl</int-virtual-link-desc>
<int-virtual-link-desc>internal-vl</int-virtual-link-desc> <layer-protocol>IPv4</layer-protocol>
<layer-protocol>IPv4</layer-protocol> </int-cpd>
</int-cpd> <int-cpd>
<int-cpd>
<id>mgmt</id>
<int-virtual-link-desc>mgmt</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<virtual-compute-desc>CP</virtual-compute-desc>
<virtual-storage-desc>root</virtual-storage-desc>
<sw-image-desc>CP</sw-image-desc>
</vdu>
<vdu>
<id>control-plane-standby</id>
<name>control-plane-standby</name>
<int-cpd>
<id>internal</id>
<int-virtual-link-desc>internal-vl</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<int-cpd>
<id>mgmt</id>
<int-virtual-link-desc>mgmt</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<virtual-compute-desc>CP</virtual-compute-desc>
<virtual-storage-desc>root</virtual-storage-desc>
<sw-image-desc>CP</sw-image-desc>
</vdu>
<vdu>
<id>data-plane</id>
<name>data-plane</name>
<int-cpd>
<id>in</id>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<int-cpd>
<id>internal</id>
<int-virtual-link-desc>internal-vl</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<int-cpd>
<id>out</id>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<virtual-compute-desc>DP</virtual-compute-desc>
<virtual-storage-desc>root</virtual-storage-desc>
<sw-image-desc>DP</sw-image-desc>
</vdu>
<virtual-compute-desc>
<id>CP</id>
<virtual-memory>
<size>16.0</size>
</virtual-memory>
<virtual-cpu>
<num-virtual-cpu>8</num-virtual-cpu>
</virtual-cpu>
</virtual-compute-desc>
<virtual-compute-desc>
<id>DP</id>
<virtual-memory>
<size>32.0</size>
</virtual-memory>
<virtual-cpu>
<num-virtual-cpu>16</num-virtual-cpu>
</virtual-cpu>
</virtual-compute-desc>
<virtual-storage-descriptor>
<id>root</id>
<type-of-storage>root</type-of-storage>
<size-of-storage>10</size-of-storage>
</virtual-storage-descriptor>
<sw-image-desc>
<id>CP</id>
<name>CP</name>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<image>http://acme.images.com/control-plane.qcow2</image>
</sw-image-desc>
<sw-image-desc>
<id>DP</id>
<name>DP</name>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<image>http://acme.images.com/data-plane.qcow2</image>
</sw-image-desc>
<int-virtual-link-desc>
<id>internal-vl</id>
<connectivity-type>
<layer-protocol>
<protocol>IPv4</protocol>
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<int-virtual-link-desc>
<id>mgmt</id> <id>mgmt</id>
<connectivity-type> <int-virtual-link-desc>mgmt</int-virtual-link-desc>
<layer-protocol> <layer-protocol>IPv4</layer-protocol>
<protocol>IPv4</protocol> </int-cpd>
</layer-protocol> <virtual-compute-desc>CP</virtual-compute-desc>
</connectivity-type> <virtual-storage-desc>root</virtual-storage-desc>
</int-virtual-link-desc> <sw-image-desc>CP</sw-image-desc>
<ext-cpd> </vdu>
<id>in</id> <vdu>
<int-cpd> <id>control-plane-standby</id>
<vdu-id>data-plane</vdu-id> <name>control-plane-standby</name>
<cpd>in</cpd> <int-cpd>
</int-cpd> <id>internal</id>
<int-virtual-link-desc>internal-vl</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol> <layer-protocol>IPv4</layer-protocol>
</ext-cpd> </int-cpd>
<ext-cpd> <int-cpd>
<id>mgmt</id> <id>mgmt</id>
<int-virtual-link-desc>mgmt</int-virtual-link-desc> <int-virtual-link-desc>mgmt</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol> <layer-protocol>IPv4</layer-protocol>
</ext-cpd> </int-cpd>
<ext-cpd> <virtual-compute-desc>CP</virtual-compute-desc>
<virtual-storage-desc>root</virtual-storage-desc>
<sw-image-desc>CP</sw-image-desc>
</vdu>
<vdu>
<id>data-plane</id>
<name>data-plane</name>
<int-cpd>
<id>in</id>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<int-cpd>
<id>internal</id>
<int-virtual-link-desc>internal-vl</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</int-cpd>
<int-cpd>
<id>out</id> <id>out</id>
<int-cpd>
<vdu-id>data-plane</vdu-id>
<cpd>out</cpd>
</int-cpd>
<layer-protocol>IPv4</layer-protocol> <layer-protocol>IPv4</layer-protocol>
</ext-cpd> </int-cpd>
<df> <virtual-compute-desc>DP</virtual-compute-desc>
<id>gold</id> <virtual-storage-desc>root</virtual-storage-desc>
<vdu-profile> <sw-image-desc>DP</sw-image-desc>
<id>control-plane-active</id> </vdu>
<min-number-of-instances>1</min-number-of-instances> <virtual-compute-desc>
<max-number-of-instances>1</max-number-of-instances> <id>CP</id>
<affinity-or-anti-affinity-group> <virtual-memory>
<id>control-plane</id> <size>16.0</size>
</affinity-or-anti-affinity-group> </virtual-memory>
</vdu-profile> <virtual-cpu>
<vdu-profile> <num-virtual-cpu>8</num-virtual-cpu>
<id>control-plane-standby</id> </virtual-cpu>
<min-number-of-instances>1</min-number-of-instances> </virtual-compute-desc>
<max-number-of-instances>1</max-number-of-instances> <virtual-compute-desc>
<affinity-or-anti-affinity-group> <id>DP</id>
<id>control-plane</id> <virtual-memory>
</affinity-or-anti-affinity-group> <size>32.0</size>
</vdu-profile> </virtual-memory>
<vdu-profile> <virtual-cpu>
<id>data-plane</id> <num-virtual-cpu>16</num-virtual-cpu>
<min-number-of-instances>2</min-number-of-instances> </virtual-cpu>
<max-number-of-instances>8</max-number-of-instances> </virtual-compute-desc>
</vdu-profile> <virtual-storage-descriptor>
<instantiation-level> <id>root</id>
<id>il-1</id> <type-of-storage>root</type-of-storage>
<vdu-level> <size-of-storage>10</size-of-storage>
<id>control-plane-active</id> </virtual-storage-descriptor>
<number-of-instances>1</number-of-instances> <sw-image-desc>
</vdu-level> <id>CP</id>
<vdu-level> <name>CP</name>
<id>control-plane-standby</id> <container-format>bare</container-format>
<number-of-instances>1</number-of-instances> <disk-format>qcow2</disk-format>
</vdu-level> <image>http://mycompany.images.com/control-plane.qcow2</image>
<vdu-level> </sw-image-desc>
<id>data-plane</id> <sw-image-desc>
<number-of-instances>2</number-of-instances> <id>DP</id>
</vdu-level> <name>DP</name>
</instantiation-level> <container-format>bare</container-format>
<instantiation-level> <disk-format>qcow2</disk-format>
<id>il-2</id> <image>http://mycompany.images.com/data-plane.qcow2</image>
<vdu-level> </sw-image-desc>
<id>control-plane-active</id> <int-virtual-link-desc>
<number-of-instances>1</number-of-instances> <id>internal-vl</id>
</vdu-level> <connectivity-type>
<vdu-level> <layer-protocol>
<id>control-plane-standby</id> <protocol>IPv4</protocol>
<number-of-instances>1</number-of-instances> </layer-protocol>
</vdu-level> </connectivity-type>
<vdu-level> </int-virtual-link-desc>
<id>data-plane</id> <int-virtual-link-desc>
<number-of-instances>4</number-of-instances> <id>mgmt</id>
</vdu-level> <connectivity-type>
</instantiation-level> <layer-protocol>
<default-instantiation-level>il-1</default-instantiation-level> <protocol>IPv4</protocol>
</layer-protocol>
</connectivity-type>
</int-virtual-link-desc>
<ext-cpd>
<id>in</id>
<int-cpd>
<vdu-id>data-plane</vdu-id>
<cpd>in</cpd>
</int-cpd>
<layer-protocol>IPv4</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>mgmt</id>
<int-virtual-link-desc>mgmt</int-virtual-link-desc>
<layer-protocol>IPv4</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>out</id>
<int-cpd>
<vdu-id>data-plane</vdu-id>
<cpd>out</cpd>
</int-cpd>
<layer-protocol>IPv4</layer-protocol>
</ext-cpd>
<df>
<id>gold</id>
<vdu-profile>
<id>control-plane-active</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group>
<id>control-plane</id> <id>control-plane</id>
<type>anti-affinity</type>
<scope>nfvi-node</scope>
</affinity-or-anti-affinity-group> </affinity-or-anti-affinity-group>
</df> </vdu-profile>
<df> <vdu-profile>
<id>silver</id> <id>data-plane</id>
<vdu-profile> <min-number-of-instances>2</min-number-of-instances>
<max-number-of-instances>8</max-number-of-instances>
</vdu-profile>
<instantiation-level>
<id>il-1</id>
<vdu-level>
<id>control-plane-active</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>control-plane-standby</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>data-plane</id>
<number-of-instances>2</number-of-instances>
</vdu-level>
</instantiation-level>
<instantiation-level>
<id>il-2</id>
<vdu-level>
<id>control-plane-active</id> <id>control-plane-active</id>
<min-number-of-instances>1</min-number-of-instances> <number-of-instances>1</number-of-instances>
<max-number-of-instances>1</max-number-of-instances> </vdu-level>
<affinity-or-anti-affinity-group> <vdu-level>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>control-plane-standby</id> <id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances> <number-of-instances>1</number-of-instances>
<max-number-of-instances>1</max-number-of-instances> </vdu-level>
<affinity-or-anti-affinity-group> <vdu-level>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>data-plane</id> <id>data-plane</id>
<min-number-of-instances>1</min-number-of-instances> <number-of-instances>4</number-of-instances>
<max-number-of-instances>4</max-number-of-instances> </vdu-level>
</vdu-profile> </instantiation-level>
<instantiation-level> <default-instantiation-level>il-1</default-instantiation-level>
<id>il-1</id> <affinity-or-anti-affinity-group>
<vdu-level> <id>control-plane</id>
<id>control-plane-active</id> <type>anti-affinity</type>
<number-of-instances>1</number-of-instances> <scope>nfvi-node</scope>
</vdu-level> </affinity-or-anti-affinity-group>
<vdu-level> </df>
<id>control-plane-standby</id> <df>
<number-of-instances>1</number-of-instances> <id>silver</id>
</vdu-level> <vdu-profile>
<vdu-level> <id>control-plane-active</id>
<id>data-plane</id> <min-number-of-instances>1</min-number-of-instances>
<number-of-instances>1</number-of-instances> <max-number-of-instances>1</max-number-of-instances>
</vdu-level>
</instantiation-level>
<instantiation-level>
<id>il-2</id>
<vdu-level>
<id>control-plane-active</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>control-plane-standby</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>data-plane</id>
<number-of-instances>2</number-of-instances>
</vdu-level>
</instantiation-level>
<default-instantiation-level>il-1</default-instantiation-level>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group>
<id>control-plane</id> <id>control-plane</id>
<type>anti-affinity</type>
<scope>nfvi-node</scope>
</affinity-or-anti-affinity-group> </affinity-or-anti-affinity-group>
</df> </vdu-profile>
</vnfd> <vdu-profile>
</nfv> <id>control-plane-standby</id>
</config> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group>
<id>control-plane</id>
</affinity-or-anti-affinity-group>
</vdu-profile>
<vdu-profile>
<id>data-plane</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>4</max-number-of-instances>
</vdu-profile>
<instantiation-level>
<id>il-1</id>
<vdu-level>
<id>control-plane-active</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>control-plane-standby</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>data-plane</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
</instantiation-level>
<instantiation-level>
<id>il-2</id>
<vdu-level>
<id>control-plane-active</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>control-plane-standby</id>
<number-of-instances>1</number-of-instances>
</vdu-level>
<vdu-level>
<id>data-plane</id>
<number-of-instances>2</number-of-instances>
</vdu-level>
</instantiation-level>
<default-instantiation-level>il-1</default-instantiation-level>
<affinity-or-anti-affinity-group>
<id>control-plane</id>
<type>anti-affinity</type>
<scope>nfvi-node</scope>
</affinity-or-anti-affinity-group>
</df>
</vnfd>
</nfv>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<container-format>bare</container-format> <container-format>bare</container-format>
<disk-format>qcow2</disk-format> <disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram> <min-ram>2.0</min-ram>
<image>http://www.cisco.com/asa.qcow2</image> <image>http://mycompany.images.com/asa.qcow2</image>
</sw-image-desc> </sw-image-desc>
<ext-cpd> <ext-cpd>
<id>inside</id> <id>inside</id>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<container-format>bare</container-format> <container-format>bare</container-format>
<disk-format>qcow2</disk-format> <disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram> <min-ram>2.0</min-ram>
<image>http://www.cisco.com/csr.qcow2</image> <image>http://mycompany.images.com/csr.qcow2</image>
</sw-image-desc> </sw-image-desc>
<ext-cpd> <ext-cpd>
<id>left</id> <id>left</id>
......
Supports Markdown
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