Fix for resumetraffic to allow traffic

ResumeTraffic action is added to LCM actions prior.   In this ticket
payload structure is added to resumetraffic in yang file.  In
ResumeTrafficService.java
and ResumeTrafficServiceTest.java added payload parameters.

Issue-ID: APPC-346
Signed-off-by: vidhyasree <sn141y@att.com>
Change-Id: I9a3ca163bbd520e599416d03edc921a6cafb3059

2 files changed, 12 insertions, 7 deletions

diff --git a/appc-provider/appc-provider-model/.gitignore b/appc-provider/appc-provider-model/.gitignore
index a7d704055..0cefa914d 100644
--- a/appc-provider/appc-provider-model/.gitignore
+++ b/appc-provider/appc-provider-model/.gitignore
@@ -1,4 +1,5 @@
 /target/
 /target-ide/
 /bin/
-/.settings/
\ No newline at end of file
+/.settings/
+/target-ide/
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 58e379251..a5947c4a4 100644
--- 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
@@ -9,15 +9,15 @@
  * 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=========================================================
  */
@@ -112,7 +112,7 @@ module appc-provider-lcm {
             enum "ConfigExport";
             enum "StopApplication";
             enum "StartApplication";
-			enum "QuiesceTraffic";
+            enum "QuiesceTraffic";
             enum "ResumeTraffic";
             enum "UpgradePreCheck";
             enum "UpgradeSoftware";
@@ -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;