Added Junit For VNFResolverDataReader

[appc.git] / appc-provider / appc-provider-model / src / main / yang / appc-provider-lcm.yang

diff --git a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
index 58e3792..2e369fa 100644 (file)
--- a/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
+++ b/appc-provider/appc-provider-model/src/main/yang/appc-provider-lcm.yang
@@ -2,22 +2,24 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2018 Orange
  * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
@@ -45,9 +47,6 @@ module appc-provider-lcm {
     yang-version 1;
     namespace "org:onap:appc:lcm";
     prefix appc-provider-lcm;
-    organization "Copyright 2017 AT&T Intellectual Property.";
-    contact
-        "Dewayne Hafenstein <dh868g@att.us.com>";
         
     description
       "Defines the services and request/response requirements for the ECOMP APP-C component.";
@@ -112,7 +111,7 @@ module appc-provider-lcm {
             enum "ConfigExport";
             enum "StopApplication";
             enum "StartApplication";
-                       enum "QuiesceTraffic";
+            enum "QuiesceTraffic";
             enum "ResumeTraffic";
             enum "UpgradePreCheck";
             enum "UpgradeSoftware";
@@ -124,6 +123,7 @@ module appc-provider-lcm {
             enum "Reboot";
             enum "AttachVolume";
             enum "DetachVolume";
+            enum "DistributeTraffic";
             
         }
         description "The action to be taken by APP-C, e.g. Restart, Rebuild, Migrate";
@@ -471,7 +471,7 @@ module appc-provider-lcm {
             }
         }
     }
-           /**********************************************************************************
+    /**********************************************************************************
      * Define the VNF quiesce traffic service
      **********************************************************************************/
     rpc quiesce-traffic {
@@ -508,7 +508,11 @@ module appc-provider-lcm {
                 mandatory true;
             }
             uses action-identifiers;
-        }
+            leaf payload {
+                type payload;
+                mandatory true;
+           }
+    }
         output {
             uses common-header;
             uses status;
@@ -535,6 +539,10 @@ module appc-provider-lcm {
         output {
             uses common-header;
             uses status;
+            leaf payload {
+                type payload;
+                mandatory true;
+                    }
         }
     }
 
@@ -581,6 +589,10 @@ module appc-provider-lcm {
         output {
             uses common-header;
             uses status;
+            leaf payload {
+                type payload;
+                mandatory true;
+                         }
         }
     }
 
@@ -773,30 +785,30 @@ module appc-provider-lcm {
         }
     }
 
-    rpc config-scaleout {
-        description "An operation to scaleout the configurations of a virtual network
-                function (or VM)";
-        input {
-            uses common-header;
-            leaf action {
-                type action;
-                mandatory true;
-            }
-            uses action-identifiers;
-            leaf payload {
-                type payload;
-                mandatory false;
+    rpc config-scale-out {
+            description "An operation to Modify the configuration or other action to support
+            a ConfigScaleOut of a VNF.";
+            input {
+                uses common-header;
+                leaf action {
+                    type action;
+                    mandatory true;
+                }
+                uses action-identifiers;
+                leaf payload {
+                    type payload;
+                    mandatory true;
+                }
             }
-        }
-        output {
-            uses common-header;
-            uses status;
-            leaf payload {
-                 type payload;
-                 mandatory false;
+            output {
+                uses common-header;
+                uses status;
+                leaf payload {
+                     type payload;
+                     mandatory false;
+                }
             }
         }
-    }
 
     rpc config-restore {
         description "An operation to restore the configurations of a virtual network
@@ -959,6 +971,11 @@ module appc-provider-lcm {
         output {
             uses common-header;
             uses status;
+            leaf payload {
+                type payload;
+                mandatory true;
+                         }
+
         }
     }
 
@@ -1300,6 +1317,29 @@ module appc-provider-lcm {
         }
     }
 
+    /**********************************************************************************
+     * Define the traffic distribution service
+     **********************************************************************************/
+    rpc distribute-traffic {
+        description "An operation to distribute traffic between VMs";
+        input {
+            uses common-header;
+            leaf action {
+                type action;
+                mandatory true;
+            }
+            uses action-identifiers;
+            leaf payload {
+                type payload;
+                mandatory true;
+            }
+        }
+        output {
+            uses common-header;
+            uses status;
+        }
+    }
+
 
 
  /**********************************************************************************