issue#33 fix AffinityOrAntiAffinityGroup element information in vnfd and nsd (b0e989a0) · Commits · NFV - Network Functions Virtualisation / SOL006

example-data/complex-vnfd.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,7 @@
	</lcm-operations-configuration>		</lcm-operations-configuration>
	<affinity-or-anti-affinity-group>		<affinity-or-anti-affinity-group>
	<id>control-plane</id>		<id>control-plane</id>
	<type>anti-affinity</type>		<affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
	<scope>nfvi-node</scope>		<scope>nfvi-node</scope>
	</affinity-or-anti-affinity-group>		</affinity-or-anti-affinity-group>
	</df>		</df>
	@@ -328,7 +328,7 @@
	</lcm-operations-configuration>		</lcm-operations-configuration>
	<affinity-or-anti-affinity-group>		<affinity-or-anti-affinity-group>
	<id>control-plane</id>		<id>control-plane</id>
	<type>anti-affinity</type>		<affinityorAntiaffinity>anti-affinity</affinityorAntiaffinity>
	<scope>nfvi-node</scope>		<scope>nfvi-node</scope>
	</affinity-or-anti-affinity-group>		</affinity-or-anti-affinity-group>
	</df>		</df>

+11 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1158,12 +1158,15 @@ submodule etsi-nfv-ns {
	information element";		information element";
	}		}

	leaf type {		leaf affinityorAntiaffinity {
	mandatory true;		mandatory true;
	type 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.
			Values:
			• AFFINITY
			• ANTI-AFFINITY";
	reference		reference
	"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity		"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
	information element";		information element";
	@@ -1174,8 +1177,12 @@ submodule etsi-nfv-ns {
	type 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,		relationship.
	network-link-and-node etc.";		Values:
			• NFVI_NODE
			• NFVI_POP
			• NETWORK_LINK_AND_NODE
			• etc.";
	reference		reference
	"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity		"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
	information element";		information element";

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2535,12 +2535,15 @@ submodule etsi-nfv-vnf {
	AffinityOrAntiAffinityGroup information element";		AffinityOrAntiAffinityGroup information element";
	}		}

	leaf type {		leaf affinityorAntiaffinity {
	mandatory true;		mandatory true;
	type 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.
			Values:
			• AFFINITY
			• ANTI-AFFINITY";
	reference		reference
	"GS NFV IFA011: Section 7.1.8.12		"GS NFV IFA011: Section 7.1.8.12
	AffinityOrAntiAffinityGroup information element";		AffinityOrAntiAffinityGroup information element";
	@@ -2551,8 +2554,13 @@ submodule etsi-nfv-vnf {
	type 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. Possible values are 'NFVI-PoP', 'Zone',		relationship.
	'ZoneGroup', 'NFVI-node' and 'network-link-and-node'.";		Values:
			• NFVI-PoP
			• Zone
			• ZoneGroup
			• NFVI-node
			• network-link-and-node";
	reference		reference
	"GS NFV IFA011: Section 7.1.8.12		"GS NFV IFA011: Section 7.1.8.12
	AffinityOrAntiAffinityGroup information element";		AffinityOrAntiAffinityGroup information element";