Revert "Revert "Re-enabling NS primitives, config-primitive over service-primitive...

[osm/IM.git] / models / yang / nsd.yang

diff --git a/models/yang/nsd.yang b/models/yang/nsd.yang
index 19aebe9..e80654f 100644 (file)
--- a/models/yang/nsd.yang
+++ b/models/yang/nsd.yang
@@ -20,7 +20,7 @@
 
 module nsd
 {
-  namespace "urn:ietf:params:xml:ns:yang:nfvo:nsd";
+  namespace "urn:etsi:osm:yang:nsd";
   prefix "nsd";
 
   import vnfd {
@@ -227,85 +227,6 @@ module nsd
     }
   }
 
-  grouping nsd-service-primitive {
-   list service-primitive {
-      description
-          "Network service level service primitives.";
-
-      key "name";
-
-      leaf name {
-        description
-            "Name of the service primitive.";
-        type string;
-      }
-
-      list parameter {
-        description
-            "List of parameters for the service primitive.";
-
-        key "name";
-        uses manotypes:primitive-parameter;
-      }
-
-      uses manotypes:ui-primitive-group;
-
-      list vnf-primitive-group {
-        description
-            "List of service primitives grouped by VNF.";
-
-        key "member-vnf-index-ref";
-        leaf member-vnf-index-ref {
-          description
-              "Reference to member-vnf within constituent-vnfds";
-          type leafref {
-             path "../../../constituent-vnfd/member-vnf-index";
-          }
-        }
-
-        leaf vnfd-id-ref {
-          description
-              "A reference to a VNFD. This is a leafref";
-
-          type leafref {
-             path "../../../constituent-vnfd" +
-                "[member-vnf-index = current()/../member-vnf-index-ref]" + "/vnfd-id-ref";
-          }
-        }
-
-        leaf vnfd-name {
-          description
-              "Name of the VNFD";
-          type leafref {
-              path "/vnfd:vnfd-catalog/vnfd:vnfd"
-                    + "[vnfd:id = current()/../vnfd-id-ref]"
-                    + "/vnfd:name";
-          }
-        }
-
-        list primitive {
-          key "index";
-
-          leaf index {
-            description "Index of this primitive";
-            type uint32;
-          }
-
-          leaf name {
-            description "Name of the primitive in the VNF primitive ";
-            type string;
-          }
-        }
-      }
-
-      leaf user-defined-script {
-        description
-            "A user defined script.";
-        type string;
-      }
-    }
-  }
-
   container nsd-catalog {
 
     leaf schema-version {
@@ -328,8 +249,6 @@ module nsd
       uses nsd-vnf-dependency;
 
       uses nsd-monitoring-param;
-
-      uses nsd-service-primitive;
     }
   }
 }