Commit 45a6233d authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Addressing issue with merge request

parent c2aebb51
Pipeline #291 failed with stage
in 0 seconds
...@@ -11,17 +11,14 @@ ...@@ -11,17 +11,14 @@
<name>Firewall VDU</name> <name>Firewall VDU</name>
<int-cpd> <int-cpd>
<id>inside</id> <id>inside</id>
<ext-cpd>inside</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<int-cpd> <int-cpd>
<id>management</id> <id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<int-cpd> <int-cpd>
<id>outside</id> <id>outside</id>
<ext-cpd>outside</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<virtual-compute-desc>asa-vcd</virtual-compute-desc> <virtual-compute-desc>asa-vcd</virtual-compute-desc>
...@@ -97,17 +94,14 @@ ...@@ -97,17 +94,14 @@
<name>Router VDU</name> <name>Router VDU</name>
<int-cpd> <int-cpd>
<id>left</id> <id>left</id>
<ext-cpd>left</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<int-cpd> <int-cpd>
<id>management</id> <id>management</id>
<ext-cpd>management</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<int-cpd> <int-cpd>
<id>right</id> <id>right</id>
<ext-cpd>right</ext-cpd>
<layer-protocol>Ethernet</layer-protocol> <layer-protocol>Ethernet</layer-protocol>
</int-cpd> </int-cpd>
<virtual-compute-desc>csr-vcd</virtual-compute-desc> <virtual-compute-desc>csr-vcd</virtual-compute-desc>
......
...@@ -4,10 +4,7 @@ submodule etsi-nfv-ns { ...@@ -4,10 +4,7 @@ submodule etsi-nfv-ns {
prefix nfv; prefix nfv;
} }
import etsi-nfv-common { include etsi-nfv-common;
prefix common;
}
include etsi-nfv-vnf; include etsi-nfv-vnf;
include etsi-nfv-pnf; include etsi-nfv-pnf;
...@@ -346,7 +343,7 @@ submodule etsi-nfv-ns { ...@@ -346,7 +343,7 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc "GS NFV IFA014: Section 6.5.2.2 NsVirtualLinkDesc
information element"; information element";
} }
uses common:security-parameters; uses security-parameters;
} }
list vnffgd { list vnffgd {
...@@ -777,7 +774,7 @@ submodule etsi-nfv-ns { ...@@ -777,7 +774,7 @@ submodule etsi-nfv-ns {
element"; element";
} }
uses common:local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
...@@ -989,7 +986,7 @@ submodule etsi-nfv-ns { ...@@ -989,7 +986,7 @@ submodule etsi-nfv-ns {
information element"; information element";
} }
uses common:local-affinity-or-anti-affinity-rule; uses local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group { list affinity-or-anti-affinity-group {
key "id"; key "id";
...@@ -1016,7 +1013,7 @@ submodule etsi-nfv-ns { ...@@ -1016,7 +1013,7 @@ submodule etsi-nfv-ns {
reference reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element"; information element";
uses common:link-bitrate-requirements; uses link-bitrate-requirements;
} }
container min-bitrate-requirements { container min-bitrate-requirements {
description description
...@@ -1025,7 +1022,7 @@ submodule etsi-nfv-ns { ...@@ -1025,7 +1022,7 @@ submodule etsi-nfv-ns {
reference reference
"GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile "GS NFV IFA014: Section 6.3.4.2 VirtualLinkProfile
information element"; information element";
uses common:link-bitrate-requirements; uses link-bitrate-requirements;
} }
} }
...@@ -1105,7 +1102,7 @@ submodule etsi-nfv-ns { ...@@ -1105,7 +1102,7 @@ submodule etsi-nfv-ns {
leaf affinity-type { leaf affinity-type {
mandatory true; mandatory true;
type common:affinity-type; type affinity-type;
description description
"Specifies the type of relationship that the members of "Specifies the type of relationship that the members of
the group have: 'affinity' or 'anti-affinity.'"; the group have: 'affinity' or 'anti-affinity.'";
...@@ -1116,7 +1113,7 @@ submodule etsi-nfv-ns { ...@@ -1116,7 +1113,7 @@ submodule etsi-nfv-ns {
leaf affinity-scope { leaf affinity-scope {
mandatory true; mandatory true;
type common:affinity-scope; type affinity-scope;
description description
"Specifies the scope of the affinity or anti-affinity "Specifies the scope of the affinity or anti-affinity
relationship e.g. a NFVI node, an NFVI PoP, etc."; relationship e.g. a NFVI node, an NFVI PoP, etc.";
...@@ -1213,7 +1210,7 @@ submodule etsi-nfv-ns { ...@@ -1213,7 +1210,7 @@ submodule etsi-nfv-ns {
VirtualLinkToLevelMapping information element"; VirtualLinkToLevelMapping information element";
} }
uses common:link-bitrate-requirements; uses link-bitrate-requirements;
} }
list ns-to-level-mapping { list ns-to-level-mapping {
...@@ -1568,7 +1565,7 @@ submodule etsi-nfv-ns { ...@@ -1568,7 +1565,7 @@ submodule etsi-nfv-ns {
} }
} }
} }
uses common:security-parameters; uses security-parameters;
} }
} }
} }
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