Skip to content
GitLab
Commit 29b957e3 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Fix default values

parent 45a6233d
Pipeline #292 failed with stage
in 0 seconds
Hide whitespace changes
Inline Side-by-side
example-data/nfv.xml
View file @ 29b957e3
......@@ -48,14 +48,26 @@
</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>
......@@ -131,14 +143,26 @@
</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>
......@@ -218,7 +242,9 @@
<virtual-link-desc>
<id>fw2dpi</id>
<connectivity-type>
<layer-protocol>Ethernet</layer-protocol>
<layer-protocol>
<protocol>Ethernet</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -231,7 +257,9 @@
<virtual-link-desc>
<id>mgmt</id>
<connectivity-type>
<layer-protocol>IPv4</layer-protocol>
<layer-protocol>
<protocol>IPv4</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -244,7 +272,9 @@
<virtual-link-desc>
<id>r2fw</id>
<connectivity-type>
<layer-protocol>Ethernet</layer-protocol>
<layer-protocol>
<protocol>Ethernet</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>normal</id>
......@@ -467,7 +497,9 @@
<virtual-link-desc>
<id>r2fw</id>
<connectivity-type>
<layer-protocol>IPv4</layer-protocol>
<layer-protocol>
<protocol>Ethernet</protocol>
</layer-protocol>
</connectivity-type>
<df>
<id>r2fw</id>
......
src/yang/etsi-nfv-common.yang
View file @ 29b957e3
......@@ -6,13 +6,13 @@ submodule etsi-nfv-common {
description
"Common data types for ETSI data models.";
revision 2018-06-19 {
revision 2019-03-18 {
description
"Initial revision
Common data structures to support VNFD and NSD according to:
ETSI GS NFV-IFA 014 Ed251v244
ETSI GS NFV-IFA 011 Ed251v243";
ETSI GS NFV-IFA 014 Ed261v252
ETSI GS NFV-IFA 011 Ed261v254";
}
/*
......@@ -253,14 +253,20 @@ submodule etsi-nfv-common {
grouping connectivity-type {
container connectivity-type {
leaf layer-protocol {
mandatory true;
type identityref {
base layer-protocol;
}
list layer-protocol {
key "protocol";
leaf protocol {
type identityref {
base layer-protocol;
}
}
description
"Identifies the protocol this VL gives access to (Ethernet,
MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).";
MPLS, ODU2, IPV4, IPV6, Pseudo-Wire).The top layer
protocol of the VL protocol stack shall always be provided.
The lower layer protocols may be included when there are
specific requirements on these layers.";
reference
"GS NFV IFA011: Section 7.1.7.3, ConnectivityType
information element.";
......
src/yang/etsi-nfv-ns.yang
View file @ 29b957e3
......@@ -11,14 +11,14 @@ submodule etsi-nfv-ns {
description
"Models for NS according to ETSI GS NFV-IFA 014.";
revision 2017-01-20 {
revision 2019-03-18 {
description
"Initial revision
Common data structure to support NSD according to:
ETSI GS NFV-IFA 011 Ed251v243";
ETSI GS NFV-IFA 011 Ed261v252";
reference
"ETSI GS NFV-IFA 011 Ed251v243";
"ETSI GS NFV-IFA 011 Ed261v252";
}
grouping resource-handle {
......@@ -493,7 +493,8 @@ submodule etsi-nfv-ns {
}
container ns {
leaf nsd-id {
must ". = deref(../../ns-profile-id)/../nsd-id" {
must ". = deref(../../nested-ns-profile-id)/" +
"../nsd-id" {
}
type leafref {
......@@ -753,7 +754,7 @@ submodule etsi-nfv-ns {
}
leaf min-number-of-instances {
mandatory true;
default 1;
type uint16;
description
"Minimum number of instances of the VNF based on this
......@@ -764,7 +765,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
mandatory true;
default 1;
type uint16;
description
"Maximum number of instances of the VNF based on this
......@@ -1177,7 +1178,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
mandatory true;
default 1;
type uint32;
description
"Specifies the number of VNF instances required for
......@@ -1237,7 +1238,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
mandatory true;
default 1;
type uint32;
description
"Specifies the number of nested NS instances required
......@@ -1343,7 +1344,7 @@ submodule etsi-nfv-ns {
}
leaf min-number-of-instances {
type uint16;
mandatory true;
default 1;
description
"Minimum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......@@ -1354,7 +1355,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
type uint16;
mandatory true;
default 1;
description
"Maximum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......
src/yang/etsi-nfv-pnf.yang
View file @ 29b957e3
......@@ -12,15 +12,15 @@ submodule etsi-nfv-pnf {
description
"Models for PNFD according to GS NFV-IFA 014.";
revision 2018-06-25 {
revision 2019-03-18 {
description
"Initial revision.
Common data structure to support VNFD according to:
ETSI GS NFV-IFA 014 Ed251v244";
ETSI GS NFV-IFA 014 Ed261v252";
reference
"ETSI GS NFV-IFA 014 Ed251v244";
"ETSI GS NFV-IFA 014 Ed261v252";
}
grouping pnfd {
......
src/yang/etsi-nfv-vnf.yang
View file @ 29b957e3
......@@ -1149,7 +1149,9 @@ submodule etsi-nfv-vnf {
}
}
leaf cpd {
path "deref(../vdu-id)/../int-cpd/id";
type leafref {
path "deref(../vdu-id)/../int-cpd/id";
}
}
}
}
......
src/yang/etsi-nfv.yang
View file @ 29b957e3
......@@ -14,11 +14,11 @@ module etsi-nfv {
description
"Network Function Virtualization Descriptors";
revision 2018-06-13 {
revision 2019-03-18 {
description
"Initial revision.
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed251v244
VNFD according to ETSI GS NFV-IFA 011 Ed251v243";
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed261v252
VNFD according to ETSI GS NFV-IFA 011 Ed261v254";
}
container nfv {
......
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