From 26bb93d9ff71420f809c44958d5a67f45771bec2 Mon Sep 17 00:00:00 2001
From: Santosh Kodicherla <ksantosh.cs@gmail.com>
Date: Fri, 20 Nov 2015 00:52:22 +0000
Subject: [PATCH] Add Tacker monitor test with new template

Adding tacker functional test for monitoring using new tosca template

Closes-Bug: 1518138

Change-Id: Idb7affa4c570952a1c295234e58b7a157878dab6
---
 ...fd-single-vdu-monitoring-new-template.yaml | 46 +++++++++++++++++++
 ...=> sample-vnfd-single-vdu-monitoring.yaml} |  2 +-
 .../functional/vnfm/test_vnf_monitoring.py    |  7 ++-
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring-new-template.yaml
 rename tacker/tests/etc/samples/{sample_vnfd_no_param_monitoring_respawn.yaml => sample-vnfd-single-vdu-monitoring.yaml} (93%)

diff --git a/tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring-new-template.yaml b/tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring-new-template.yaml
new file mode 100644
index 000000000..cf2cfda70
--- /dev/null
+++ b/tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring-new-template.yaml
@@ -0,0 +1,46 @@
+template_name: sample-vnfd-monitoring-new-template
+description: demo-example
+
+service_properties:
+  Id: sample-vnfd
+  vendor: tacker
+  version: 1
+
+vdus:
+  vdu1:
+    id: vdu1
+    vm_image: cirros-0.3.4-x86_64-uec
+    instance_type: m1.tiny
+    user_data_format: RAW
+    user_data: |
+       #!/bin/sh
+       df -h > /home/cirros/diskinfo
+       sleep 90
+       sudo ifdown eth0
+
+    network_interfaces:
+      management:
+        network: net_mgmt
+        management: true
+      pkt_in:
+        network: net0
+      pkt_out:
+        network: net1
+
+    placement_policy:
+      availability_zone: nova
+
+    auto-scaling: noop
+    monitoring_policy:
+      ping:
+        monitoring_params:
+          monitoring_delay: 45
+          count: 3
+          interval: .5
+          timeout: 2
+        actions:
+          failure: respawn
+
+    config:
+      param0: key0
+      param1: key1
diff --git a/tacker/tests/etc/samples/sample_vnfd_no_param_monitoring_respawn.yaml b/tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring.yaml
similarity index 93%
rename from tacker/tests/etc/samples/sample_vnfd_no_param_monitoring_respawn.yaml
rename to tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring.yaml
index 3376e0cf3..5902ee76b 100644
--- a/tacker/tests/etc/samples/sample_vnfd_no_param_monitoring_respawn.yaml
+++ b/tacker/tests/etc/samples/sample-vnfd-single-vdu-monitoring.yaml
@@ -1,4 +1,4 @@
-template_name: sample-vnfd-nonparam-respawn
+template_name: sample-vnfd-monitoring
 description: demo-example
 
 service_properties:
diff --git a/tacker/tests/functional/vnfm/test_vnf_monitoring.py b/tacker/tests/functional/vnfm/test_vnf_monitoring.py
index 2ab44a75d..c01258c95 100644
--- a/tacker/tests/functional/vnfm/test_vnf_monitoring.py
+++ b/tacker/tests/functional/vnfm/test_vnf_monitoring.py
@@ -53,7 +53,7 @@ class VnfTestPingMonitor(base.BaseTackerTest):
 
     def test_create_delete_vnf_monitoring(self):
         self._test_vnf_with_monitoring(
-            'sample_vnfd_no_param_monitoring_respawn.yaml',
+            'sample-vnfd-single-vdu-monitoring.yaml',
             'ping monitor vnf')
 
     def test_create_delete_vnf_http_monitoring(self):
@@ -65,3 +65,8 @@ class VnfTestPingMonitor(base.BaseTackerTest):
         self._test_vnf_with_monitoring(
             'sample-vnfd-multi-vdu-monitoring.yaml',
             'multi vdu ping monitor vnf')
+
+    def test_create_delete_vnf_monitoring_new_template(self):
+        self._test_vnf_with_monitoring(
+            'sample-vnfd-single-vdu-monitoring-new-template.yaml',
+            'ping monitor vnf new template')