X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfr.yang;h=ebccf129efb289b36b7fa96cc5c1c7d778d2207e;hb=9eba2577c8cc1de7cfe9f650bd53fee302881bef;hp=9e1203283f7b34d481361c120484d1da93b21e27;hpb=4870d0ee29789b859931e4e2c73e13dcb29537d5;p=osm%2FSO.git

diff --git a/models/plugins/yang/vnfr.yang b/models/plugins/yang/vnfr.yang
index 9e120328..ebccf129 100644
--- a/models/plugins/yang/vnfr.yang
+++ b/models/plugins/yang/vnfr.yang
@@ -55,10 +55,6 @@ module vnfr
     prefix "rw-project";
   }
 
-  import rw-cloud {
-    prefix "rw-cloud";
-  }
-
   revision 2017-02-28 {
     description
       "Update model to support projects.";
@@ -285,7 +281,9 @@ module vnfr
         }
 
         // Use parameters provided here to configure this VNF
-        uses manotypes:vnf-configuration;
+      container vnf-configuration {
+        uses manotypes:vca-configuration;
+      }
 
         // Mainly used by Mon-params & dashboard url
         container mgmt-interface {
@@ -437,6 +435,10 @@ module vnfr
 
           uses manotypes:supplemental-boot-data;
 
+        container vdu-configuration {
+          uses manotypes:vca-configuration;
+        }
+
           list volumes {
             key "name";
 
@@ -485,57 +487,56 @@ module vnfr
             uses associated-virtual-cps;
           }
 
-          list interface {
-            description
-                "List of interfaces (internal and external) for the VNF";
-            key name;
-
-            leaf name {
-              description
-                  "Name of the interface. Note that this
-                  name has only local significance to the VDU.";
-              type string;
-            }
+        list interface {
+          description
+              "List of interfaces (internal and external) for the VNF";
+          key name;
 
-            leaf position {
-              description
-                  "Explicit Position of the interface within the list";
-              type uint32;
-            }
+          leaf name {
+            description
+                "Name of the interface. Note that this
+                name has only local significance to the VDU.";
+            type string;
+          }
 
-            leaf type {
-              description
-                  "Type of the Interface";
+          leaf position {
+            description
+                "Explicit Position of the interface within the list";
+            type uint32;
+          }
 
-              type vnfd-base:interface-type;
+          leaf type {
+            description
+                "Type of the Interface";
 
-              default "EXTERNAL";
-            }
+            type vnfd-base:interface-type;
 
-            choice connection-point-type {
-              case internal {
-                leaf internal-connection-point-ref {
-                  description
-                      "Leaf Ref to the particular internal connection point";
-                  type leafref {
-                    path "../../internal-connection-point/id";
-                  }
+            default "EXTERNAL";
+          }
+          choice connection-point-type {
+            case internal {
+              leaf internal-connection-point-ref {
+                description
+                    "Leaf Ref to the particular internal connection point";
+                type leafref {
+                  path "../../internal-connection-point/id";
                 }
               }
-              case external {
-                leaf external-connection-point-ref {
-                  description
-                      "Leaf Ref to the particular external connection point";
-                  type leafref {
-                    path "../../../connection-point/name";
-                  }
+            }
+            case external {
+              leaf external-connection-point-ref {
+                description
+                    "Leaf Ref to the particular external connection point";
+                type leafref {
+                  path "../../../connection-point/name";
                 }
               }
             }
-            uses virtual-interface;
           }
+          uses virtual-interface;
+        }
 
-          leaf operational-status {
+         leaf operational-status {
             description
               "The operational status of the VDU
                 init                : The VDU has just started.
@@ -548,7 +549,8 @@ module vnfr
                 failed              : The VDU  instantiation failed.
               ";
             type vdu-operational-status;
-          }
+         }
+
           uses placement-group-info;
         }
 
@@ -601,54 +603,4 @@ module vnfr
       }
     }
   }
-
-  rpc create-alarm {
-    description "Create an alert for a running VDU";
-    input {
-      uses manotypes:rpc-project-name;
-
-      leaf cloud-account {
-        mandatory true;
-        type leafref {
-          path "/rw-project:project[rw-project:name=current()/../project-name]" +
-            "/rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
-        }
-      }
-
-      leaf vdur-id {
-        mandatory true;
-        type string;
-      }
-
-      container alarm {
-        uses manotypes:alarm;
-      }
-    }
-
-    output {
-      leaf alarm-id {
-        type string;
-      }
-    }
-  }
-
-  rpc destroy-alarm {
-    description "Destroy an alert that is associated with a running VDU";
-    input {
-      uses manotypes:rpc-project-name;
-
-      leaf cloud-account {
-        mandatory true;
-        type leafref {
-          path "/rw-project:project[rw-project:name=current()/../project-name]" +
-            "/rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
-        }
-      }
-
-      leaf alarm-id {
-        mandatory true;
-        type string;
-      }
-    }
-  }
 }