Commit 5a61062e authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Revert "Merge branch 'bug#94' into 'master'"

This reverts merge request !10
parent 41533b76
Pipeline #278 passed with stage
in 0 seconds
......@@ -4,21 +4,24 @@
<provider>My Company</provider>
<product-name>My Company ASAv</product-name>
<software-version>9.8</software-version>
<version>9.8</version>
<version>9.8 </version>
<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>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>outside</id>
<ext-cpd>outside</ext-cpd>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<virtual-compute-desc>asa-vcd</virtual-compute-desc>
......@@ -48,26 +51,14 @@
</sw-image-desc>
<ext-cpd>
<id>inside</id>
<int-cpd>
<vdu-id>firewall</vdu-id>
<cpd>inside</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>management</id>
<int-cpd>
<vdu-id>firewall</vdu-id>
<cpd>management</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>outside</id>
<int-cpd>
<vdu-id>firewall</vdu-id>
<cpd>outside</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<df>
......@@ -106,14 +97,17 @@
<name>Router VDU</name>
<int-cpd>
<id>left</id>
<ext-cpd>left</ext-cpd>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<int-cpd>
<id>right</id>
<ext-cpd>right</ext-cpd>
<layer-protocol>Ethernet</layer-protocol>
</int-cpd>
<virtual-compute-desc>csr-vcd</virtual-compute-desc>
......@@ -143,26 +137,14 @@
</sw-image-desc>
<ext-cpd>
<id>left</id>
<int-cpd>
<vdu-id>router</vdu-id>
<cpd>left</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>management</id>
<int-cpd>
<vdu-id>router</vdu-id>
<cpd>management</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<ext-cpd>
<id>right</id>
<int-cpd>
<vdu-id>router</vdu-id>
<cpd>right</cpd>
</int-cpd>
<layer-protocol>Ethernet</layer-protocol>
</ext-cpd>
<df>
......@@ -243,9 +225,7 @@
<id>fw2dpi</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol>
<protocol>Ethernet</protocol>
</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -259,9 +239,7 @@
<id>mgmt</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol>
<protocol>IPv4</protocol>
</layer-protocol>
<layer-protocol>IPv4</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -275,9 +253,7 @@
<id>r2fw</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol>
<protocol>Ethernet</protocol>
</layer-protocol>
<layer-protocol>Ethernet</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -471,9 +447,7 @@
<id>r2fw</id>
<version>1.0</version>
<connectivity-type>
<layer-protocol>
<protocol>IPv4</protocol>
</layer-protocol>
<layer-protocol>IPv4</layer-protocol>
</connectivity-type>
<df>
<id>r2fw</id>
......
This diff is collapsed.
......@@ -4,21 +4,24 @@ submodule etsi-nfv-ns {
prefix nfv;
}
include etsi-nfv-common;
import etsi-nfv-common {
prefix common;
}
include etsi-nfv-vnf;
include etsi-nfv-pnf;
description
"Models for NS according to ETSI GS NFV-IFA 014.";
revision 2019-03-18 {
revision 2017-01-20 {
description
"Initial revision
Common data structure to support NSD according to:
ETSI GS NFV-IFA 014 Ed261v252";
ETSI GS NFV-IFA 011 Ed251v243";
reference
"ETSI GS NFV-IFA 014 Ed261v252";
"ETSI GS NFV-IFA 011 Ed251v243";
}
grouping resource-handle {
......@@ -130,7 +133,7 @@ submodule etsi-nfv-ns {
description
"Identifier of this Cpd information element.";
reference
"GS NFV IFA014: Section 6.6.3.1 Cpd information element";
"GS NFC IFA014: Section 6.6.3.1 Cpd information element";
}
leaf address-assignment {
......@@ -245,7 +248,7 @@ submodule etsi-nfv-ns {
information element";
}
uses connectivity-type;
uses common:connectivity-type;
list df {
key "id";
......@@ -269,7 +272,6 @@ submodule etsi-nfv-ns {
}
container qos {
presence "VL QoS parameters";
description
"The QoS information element specifies quality of
service parameters applicable to a VL.";
......@@ -362,7 +364,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc
information element";
}
uses security-parameters;
uses common:security-parameters;
}
list vnffgd {
......@@ -483,7 +485,7 @@ submodule etsi-nfv-ns {
}
container ns {
leaf nsd-id {
must ". = deref(../../nested-ns-profile-id)/../nsd-id" {
must ". = deref(../../ns-profile-id)/../nsd-id" {
}
type leafref {
......@@ -743,7 +745,7 @@ submodule etsi-nfv-ns {
}
leaf min-number-of-instances {
default 1;
mandatory true;
type uint16;
description
"Minimum number of instances of the VNF based on this
......@@ -754,7 +756,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
default 1;
mandatory true;
type uint16;
description
"Maximum number of instances of the VNF based on this
......@@ -764,7 +766,7 @@ submodule etsi-nfv-ns {
element";
}
uses local-affinity-or-anti-affinity-rule;
uses common:local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
......@@ -930,7 +932,7 @@ submodule etsi-nfv-ns {
information element";
}
uses local-affinity-or-anti-affinity-rule;
uses common:local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
......@@ -957,7 +959,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
container min-bitrate-requirements {
description
......@@ -966,7 +968,7 @@ submodule etsi-nfv-ns {
reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element";
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
}
......@@ -1046,7 +1048,7 @@ submodule etsi-nfv-ns {
leaf affinity-type {
mandatory true;
type affinity-type;
type common:affinity-type;
description
"Specifies the type of relationship that the members of
the group have: 'affinity' or 'anti-affinity.'";
......@@ -1057,7 +1059,7 @@ submodule etsi-nfv-ns {
leaf affinity-scope {
mandatory true;
type affinity-scope;
type common:affinity-scope;
description
"Specifies the scope of the affinity or anti-affinity
relationship e.g. a NFVI node, an NFVI PoP, etc.";
......@@ -1121,7 +1123,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
default 1;
mandatory true;
type uint32;
description
"Specifies the number of VNF instances required for
......@@ -1154,7 +1156,7 @@ submodule etsi-nfv-ns {
VirtualLinkToLevelMapping information element";
}
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
list ns-to-level-mapping {
......@@ -1181,7 +1183,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
default 1;
mandatory true;
type uint32;
description
"Specifies the number of nested NS instances required
......@@ -1287,7 +1289,7 @@ submodule etsi-nfv-ns {
}
leaf min-number-of-instances {
type uint16;
default 1;
mandatory true;
description
"Minimum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......@@ -1298,7 +1300,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
type uint16;
default 1;
mandatory true;
description
"Maximum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......@@ -1482,7 +1484,7 @@ submodule etsi-nfv-ns {
}
}
}
uses security-parameters;
uses common:security-parameters;
}
}
}
......@@ -12,15 +12,15 @@ submodule etsi-nfv-pnf {
description
"Models for PNFD according to GS NFV-IFA 014.";
revision 2019-03-18 {
revision 2018-06-25 {
description
"Initial revision.
Common data structure to support VNFD according to:
ETSI GS NFV-IFA 014 Ed261v252";
ETSI GS NFV-IFA 014 Ed251v244";
reference
"ETSI GS NFV-IFA 014 Ed261v252";
"ETSI GS NFV-IFA 014 Ed251v244";
}
grouping pnfd {
......@@ -111,7 +111,6 @@ submodule etsi-nfv-pnf {
reference
"GS NFV-IFA014: Section 6.6.2, Pnfd information element";
}
uses security-group-rule;
}
}
}
This diff is collapsed.
......@@ -14,11 +14,11 @@ module etsi-nfv {
description
"Network Function Virtualization Descriptors";
revision 2019-03-18 {
revision 2018-06-13 {
description
"Initial revision.
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed261v252
VNFD according to ETSI GS NFV-IFA 011 Ed261v254";
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed251v244
VNFD according to ETSI GS NFV-IFA 011 Ed251v243";
}
container nfv {
......
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