Revert "Re-enabling NS primitives, config-primitive over service-primitive, clean-up"
This reverts commit 420ce6cb281ad3c3d45f14c36e1fc4428895bee8.
Change-Id: I7b7f14667478b73c7d74a012558552c59f326f27
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 45ca7f7..894b7a5 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -390,10 +390,10 @@
type manotypes:scaling-trigger;
}
- leaf ns-config-primitive-name-ref {
- description "Reference to the NS primitive";
+ leaf ns-service-primitive-name-ref {
+ description "Reference to the NS service primitive";
type leafref {
- path "../../../ns-configuration/config-primitive/name";
+ path "../../../service-primitive/name";
}
}
}
@@ -555,7 +555,24 @@
uses manotypes:ip-profile-list;
container ns-configuration {
- uses manotypes:vca-configuration;
+ uses manotypes:ns-configuration;
+ }
+
+ list initial-service-primitive {
+ description
+ "Initial set of service primitives for NSD.";
+ key "seq";
+
+ uses manotypes:event-config;
+ }
+
+ list terminate-service-primitive {
+ description
+ "Set of service primitives during
+ termination for NSD.";
+ key "seq";
+
+ uses manotypes:event-config;
}
uses manotypes:input-parameter-xpath;