Re-enabling NS primitives, config-primitive over service-primitive, clean-up

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

diff --git a/models/yang/project-nsd.yang b/models/yang/project-nsd.yang
index ace4102..e0ac7f3 100644 (file)
--- a/models/yang/project-nsd.yang
+++ b/models/yang/project-nsd.yang
@@ -20,7 +20,7 @@
 
 module project-nsd
 {
-  namespace "http://riftio.com/ns/riftware-1.0/project-nsd";
+  namespace "urn:etsi:osm:yang:project-nsd";
   prefix "project-nsd";
 
   import mano-types {
@@ -35,8 +35,8 @@ module project-nsd
     prefix "nsd-base";
   }
 
-  import rw-project {
-    prefix "rw-project";
+  import osm-project {
+    prefix "osm-project";
   }
 
 
@@ -70,7 +70,7 @@ module project-nsd
         description
           "Identifier for the VNFD.";
         type leafref {
-          path "/rw-project:project[rw-project:name = current()/../../../../rw-project:name]" +
+          path "/osm-project:project[osm-project:name = current()/../../../../osm-project:name]" +
             "/project-vnfd:vnfd-catalog/project-vnfd:vnfd/project-vnfd:id";
         }
       }
@@ -104,7 +104,7 @@ module project-nsd
         description
           "Identifier for the VNFD.";
         type leafref {
-          path "/rw-project:project[rw-project:name = current()/../../../../../rw-project:name]" +
+          path "/osm-project:project[osm-project:name = current()/../../../../../osm-project:name]" +
             "/project-vnfd:vnfd-catalog/project-vnfd:vnfd/project-vnfd:id";
         }
       }
@@ -413,164 +413,6 @@ module project-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 "../../../../../project-vnfd:vnfd-catalog/project-vnfd:vnfd"
-                    + "[project-vnfd:id = current()/../vnfd-id-ref]"
-                    + "/project-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;
-      }
-    }
-  }
-
-  grouping nsr-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 "../../../../../../project-vnfd:vnfd-catalog/project-vnfd:vnfd"
-                    + "[project-vnfd:id = current()/../vnfd-id-ref]"
-                    + "/project-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;
-      }
-    }
-  }
-
   grouping nsd-descriptor {
      uses nsd-base:nsd-descriptor-common;
 
@@ -583,11 +425,9 @@ module project-nsd
      uses nsd-vnf-dependency;
 
      uses nsd-monitoring-param;
-
-     uses nsd-service-primitive;
   }
 
-  augment "/rw-project:project" {
+  augment "/osm-project:project" {
     container nsd-catalog {
 
       list nsd {