Revert "Revert "Re-enabling NS primitives, config-primitive over service-primitive, clean-up""
This reverts commit 25fa538e051d06cfa4c3f23dc6617d090211cfcf.
Change-Id: I2dc58cde1cc2ed1397c644356c8bca8680ab1110
Signed-off-by: Michele Carignani <michele.carignani@etsi.org>
diff --git a/models/yang/nsd-base.yang b/models/yang/nsd-base.yang
index 894b7a5..45ca7f7 100644
--- a/models/yang/nsd-base.yang
+++ b/models/yang/nsd-base.yang
@@ -390,10 +390,10 @@
type manotypes:scaling-trigger;
}
- leaf ns-service-primitive-name-ref {
- description "Reference to the NS service primitive";
+ leaf ns-config-primitive-name-ref {
+ description "Reference to the NS primitive";
type leafref {
- path "../../../service-primitive/name";
+ path "../../../ns-configuration/config-primitive/name";
}
}
}
@@ -555,24 +555,7 @@
uses manotypes:ip-profile-list;
container ns-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:vca-configuration;
}
uses manotypes:input-parameter-xpath;