Commit c570c31b authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Changes to address bug#88

parent 85681425
Pipeline #181 passed with stage
in 0 seconds
<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>
<id>ASA</id>
<provider>Cisco</provider>
<product-name>Cisco ASAv</product-name>
<provider>My Company</provider>
<product-name>My Company ASAv</product-name>
<software-version>9.8</software-version>
<version>9.8 </version>
<vnfm-info>ESC</vnfm-info>
<vnfm-info>My Company Vnfm</vnfm-info>
<vdu>
<id>firewall</id>
<name>Firewall VDU</name>
<int-cpd>
<id>inside</id>
<ext-cpd>inside</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>outside</id>
<ext-cpd>outside</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<virtual-compute-desc>asa-vcd</virtual-compute-desc>
<virtual-storage-desc>asa-vsd</virtual-storage-desc>
......@@ -52,15 +51,15 @@
</sw-image-desc>
<ext-cpd>
<id>inside</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>management</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>outside</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<df>
<id>normal</id>
......@@ -88,28 +87,28 @@
</vnfd>
<vnfd>
<id>CSR</id>
<provider>Cisco</provider>
<product-name>Cisco CSR 1000v</product-name>
<provider>My Company</provider>
<product-name>My Company CSR 1000v</product-name>
<software-version>3.16</software-version>
<version>3.16</version>
<vnfm-info>ESC</vnfm-info>
<vnfm-info>My Company Vnfm</vnfm-info>
<vdu>
<id>router</id>
<name>Router VDU</name>
<int-cpd>
<id>left</id>
<ext-cpd>left</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>right</id>
<ext-cpd>right</ext-cpd>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<virtual-compute-desc>csr-vcd</virtual-compute-desc>
<virtual-storage-desc>csr-vsd</virtual-storage-desc>
......@@ -138,15 +137,15 @@
</sw-image-desc>
<ext-cpd>
<id>left</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>management</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>right</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<df>
<id>normal</id>
......@@ -226,7 +225,7 @@
<id>fw2dpi</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -240,7 +239,7 @@
<id>mgmt</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>
<layer-protocol>IPv4</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -254,7 +253,7 @@
<id>r2fw</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -448,7 +447,7 @@
<id>r2fw</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:IPv4</layer-protocol>
<layer-protocol>IPv4</layer-protocol>
</connectivity-type>
<df>
<id>r2fw</id>
......@@ -513,8 +512,7 @@
<version>1.0</version>
<ext-cpd>
<id>outside</id>
<layer-protocol xmlns:common="urn:etsi:params:xml:ns:yang:etsi-nfv-common">common:Ethernet</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
</pnfd>
</nfv>
</config>
</nfv>
......@@ -10,7 +10,6 @@ cd src
echo "Testing compilation"
CONFD_OPTS="--fail-on-warnings"
CONFD_OPTS=""
confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv-common.fxs etsi-nfv-common.yang
confdc -c $CONFD_OPTS -o /opt/confd/etc/confd/etsi-nfv.fxs etsi-nfv.yang
echo "Starting ConfD"
......
module etsi-nfv-common {
namespace "urn:etsi:params:xml:ns:yang:etsi-nfv-common";
submodule etsi-nfv-common {
yang-version 1.1;
prefix common;
belongs-to etsi-nfv {
prefix nfv;
}
description
"Common data types for ETSI data models.";
......@@ -395,7 +395,7 @@ module etsi-nfv-common {
leaf layer-protocol {
mandatory true;
type identityref {
base common:layer-protocol;
base layer-protocol;
}
description
"Identifies a protocol that the connection points
......@@ -406,7 +406,7 @@ module etsi-nfv-common {
}
leaf role {
type identityref {
base common:cp-role;
base cp-role;
}
description
"Identifies the role of the connection points
......
......@@ -7,9 +7,7 @@ submodule etsi-nfv-pnf {
/*
* Import
*/
import etsi-nfv-common {
prefix common;
}
include etsi-nfv-common;
description
"Models for PNFD according to GS NFV-IFA 014.";
......@@ -83,7 +81,7 @@ submodule etsi-nfv-pnf {
}
list ext-cpd {
key "id";
uses common:cpd;
uses cpd;
description
"Specifies the characteristics of one or more connection
points where to connect the PNF to a VL.";
......@@ -92,7 +90,7 @@ submodule etsi-nfv-pnf {
}
list security {
key "signature";
uses common:security-parameters;
uses security-parameters;
description
"Provides a signature to prevent tampering.
Editor's Note: While IFA014 does specify that the PNFD
......
......@@ -4,15 +4,14 @@ submodule etsi-nfv-vnf {
prefix nfv;
}
include etsi-nfv-common;
import ietf-inet-types {
prefix inet;
}
import ietf-yang-types {
prefix yang;
}
import etsi-nfv-common {
prefix common;
}
description
"Models for VNFD according to GS NFV-IFA 011.";
......@@ -81,16 +80,15 @@ submodule etsi-nfv-vnf {
"GS NFV-IFA011: Section 7.1.6.6,
VirtualNetworkInterfaceRequirements information element";
}
leaf niclo-requirements {
type leafref {
path "/nfv/vnfd/virtual-compute-descriptor/id";
}
description
"This references (couples) the CPD with any logical node
I/O requirements (for network devices) that may have been
created. Linking these attributes is necessary so that
I/O requirements that need to be articulated at the
"This references (couples) the CPD with any logical node I/O
requirements (for network devices) that may have been
created. Linking these attributes is necessary so that so
that I/O requirements that need to be articulated at the
logical node level can be associated with the network
interface requirements associated with the CPD.";
reference
......@@ -104,7 +102,7 @@ submodule etsi-nfv-vnf {
// IFA011. A similar definition of Cpd exists in IFA014, but
// that is for use with Sapd and Pnfd. Do not use this grouping
// for that.
grouping cpd {
grouping vnf-cpd {
description
"A Cpd information element describes network
connectivity to a compute resource or a VL.";
......@@ -121,7 +119,7 @@ submodule etsi-nfv-vnf {
leaf layer-protocol {
mandatory true;
type identityref {
base common:layer-protocol;
base layer-protocol;
}
description
"Identifies which protocol the CP uses for connectivity
......@@ -132,7 +130,7 @@ submodule etsi-nfv-vnf {
}
leaf role {
type identityref {
base common:cp-role;
base cp-role;
}
description
"Identifies the role of the port in the context of the
......@@ -159,7 +157,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
leaf associated-layer-protocol {
type identityref {
base common:layer-protocol;
base layer-protocol;
}
description
"One of the values of the attribute layerProtocol of the Cpd
......@@ -173,7 +171,7 @@ submodule etsi-nfv-vnf {
key "address-type";
leaf address-type {
type identityref {
base common:address-type;
base address-type;
}
description
"Describes the type of the address to be assigned to the CP
......@@ -450,7 +448,7 @@ submodule etsi-nfv-vnf {
element.";
}
uses cpd;
uses vnf-cpd;
}
leaf virtual-compute-desc {
type leafref {
......@@ -541,7 +539,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element.";
}
uses common:monitoring-parameter;
uses monitoring-parameter;
}
list configurable-properties {
key "key";
......@@ -1225,7 +1223,7 @@ submodule etsi-nfv-vnf {
}
}
uses common:connectivity-type;
uses connectivity-type;
leaf-list test-access {
type string;
......@@ -1256,7 +1254,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element.";
}
uses common:monitoring-parameter;
uses monitoring-parameter;
}
}
......@@ -1286,7 +1284,7 @@ submodule etsi-nfv-vnf {
ext-CP to the VDU's CP.
*/
uses virtual-network-interface-requirements;
uses cpd;
uses vnf-cpd;
}
list df {
......@@ -1350,7 +1348,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.3, VduProfile information
element.";
}
uses common:local-affinity-or-anti-affinity-rule;
uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
description
......@@ -1385,7 +1383,7 @@ submodule etsi-nfv-vnf {
information element.";
}
leaf scope {
type common:affinity-scope;
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'";
......@@ -1425,7 +1423,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
information element.";
}
uses common:local-affinity-or-anti-affinity-rule;
uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
leaf id {
......@@ -1559,7 +1557,7 @@ submodule etsi-nfv-vnf {
}
leaf-list supported-operation {
type identityref {
base common:supported-operation;
base supported-operation;
}
description
"Indicates which operations are available for this DF via
......@@ -1782,7 +1780,7 @@ submodule etsi-nfv-vnf {
leaf type {
mandatory true;
type common:affinity-type;
type affinity-type;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
......@@ -1793,7 +1791,7 @@ submodule etsi-nfv-vnf {
leaf scope {
mandatory true;
type common:affinity-scope;
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
......@@ -1820,7 +1818,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3 MonitoringParameter
information element";
}
uses common:monitoring-parameter;
uses monitoring-parameter;
}
list scaling-aspect {
......@@ -2094,7 +2092,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.2 VNFD information element";
leaf event {
type common:internal-lifecycle-management-script-event;
type internal-lifecycle-management-script-event;
description
"Describes VNF lifecycle event(s) or an external stimulus
detected on a VNFM reference point.";
......
......@@ -3,9 +3,10 @@ module etsi-nfv {
namespace "urn:etsi:params:xml:ns:yang:etsi-nfv";
prefix nfv;
include etsi-nfv-common;
include etsi-nfv-ns;
include etsi-nfv-vnf;
include etsi-nfv-pnf;
include etsi-nfv-ns;
organization
"European Telecommunications Standards Institute (ETSI)";
......
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