Fix monitoring of TOSCA VNFDs

Change-Id: I428bc68bfad90a80a43ba07f1632b39a10509fa3
Implements: bp/tosca-parser-integration

devstack/samples/sample-tosca-vnfd-http-monitor.yaml

@@ -20,11 +20,11 @@ topology_template:
         monitoring_policy:
           name: http_ping
           parameters:
-            retry: "5"
+            retry: 5
-            timeout: "10"
+            timeout: 10
-            port: "8000"
+            port: 8000
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker

devstack/samples/sample-tosca-vnfd-monitor.yaml

@@ -20,12 +20,12 @@ topology_template:
         monitoring_policy:
           name: ping
           parameters:
-            monitoring_delay: "45"
+            monitoring_delay: 45
-            count: "3"
+            count: 3
-            interval: "0.5"
+            interval: 1
-            timeout: "2"
+            timeout: 2
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker

devstack/samples/tosca_openwrt.yaml

@@ -19,11 +19,11 @@ topology_template:
         mgmt_driver: openwrt
         monitoring_policy:
           name: ping
-          actions:
-            - {trigger: failure, action: respawn}
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
+          actions:
+            failure: respawn
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_flavor.yaml

@@ -22,10 +22,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_flavor_and_capabilities.yaml

@@ -23,10 +23,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
     CP1:
       type: tosca.nodes.nfv.CP.Tacker
       properties:

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_flavor_defaults.yaml

@@ -20,10 +20,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
     CP1:
       type: tosca.nodes.nfv.CP.Tacker
       properties:

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_flavor_no_units.yaml

@@ -22,10 +22,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
     CP1:
       type: tosca.nodes.nfv.CP.Tacker
       properties:

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_image.yaml

@@ -20,10 +20,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker

tacker/tests/unit/vm/infra_drivers/heat/data/test_tosca_openwrt.yaml

@@ -20,10 +20,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
 
     CP1:
       type: tosca.nodes.nfv.CP.Tacker
@@ -42,14 +42,3 @@ topology_template:
         network_name: existing_network_1
         vendor: ACME
 
-#  policies:
-#    - monitor_policy:
-#        type: tosca.policies.tacker.Monitoring.Ping
-#        description: Apply monitoring policy to VDUs
-#        targets: [ VDU1 ]
-#        properties:
-#          parameters:
-#            count: "3"
-#            interval: "10"
-#          actions:
-#            - {trigger: failure, action: respawn}

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_all_numa_count.yaml

@@ -30,7 +30,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_all_numa_nodes.yaml

@@ -38,7 +38,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_cpu_allocations.yaml

@@ -28,7 +28,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_huge_pages.yaml

@@ -23,7 +23,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_numa_nodes.yaml

@@ -31,7 +31,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_flavor_numa_nodes_count.yaml

@@ -32,7 +32,7 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_mgmt_sriov.yaml

@@ -17,10 +17,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
         config: |
           param0: key1
           param1: key2
@@ -54,4 +54,4 @@ topology_template:
       type: tosca.nodes.nfv.VL
       properties:
         network_name: net0
-        vendor: Tacker
+        vendor: Tacker

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_sriov.yaml

@@ -17,10 +17,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
         config: |
           param0: key1
           param1: key2
@@ -55,4 +55,4 @@ topology_template:
       type: tosca.nodes.nfv.VL
       properties:
         network_name: sr3010
-        vendor: Tacker
+        vendor: Tacker

tacker/tests/unit/vm/infra_drivers/heat/data/tosca_vnic_port.yaml

@@ -17,10 +17,10 @@ topology_template:
         monitoring_policy:
           name: ping
           actions:
-            - {trigger: failure, action: respawn}
+            failure: respawn
           parameters:
-            count: "3"
+            count: 3
-            interval: "10"
+            interval: 10
         config: |
           param0: key1
           param1: key2
@@ -55,4 +55,4 @@ topology_template:
       type: tosca.nodes.nfv.VL
       properties:
         network_name: net0
-        vendor: Tacker
+        vendor: Tacker

tacker/tests/unit/vm/infra_drivers/heat/test_heat.py

@@ -217,10 +217,11 @@ class TestDeviceHeat(base.TestCase):
                 'description': u'OpenWRT with services',
                 'attributes': {'heat_template': tosca_hw_dict,
                                'monitoring_policy': '{"vdus": {"VDU1":'
-                               ' {"name": "ping", "actions": [{"trigger":'
+                               ' {"ping": {"name": "ping",'
-                               ' "failure", "action": "respawn"}],'
+                               ' "actions": {"failure": "respawn"},'
-                               ' "parameters": {"count": "3", "interval": "10"'
+                               ' "parameters": {"count": 3, "interval": 10'
-                               '}}}}',
+                               '}, "monitoring_params": {"count": 3, '
+                               '"interval": 10}}}}}',
                                'param_values': ''},
                 'id': 'eb84260e-5ff7-4332-b032-50a14d6c1123',
                 'instance_id': None, 'mgmt_url': None, 'name': u'test_openwrt',

tacker/tests/unit/vm/test_toscautils.py

@@ -53,12 +53,14 @@ class TestToscaUtils(testtools.TestCase):
         self.assertEqual(mgmt_driver, expected_mgmt_driver)
 
     def test_get_vdu_monitoring(self):
-        expected_monitoring = {'vdus': {'VDU1': {'actions':
+        expected_monitoring = {'vdus': {'VDU1': {'ping': {
-                                 [{'action': 'respawn',
+                               'actions':
-                                   'trigger': 'failure'}],
+                               {'failure': 'respawn'},
                                'name': 'ping',
-                               'parameters': {'count': '3',
+                               'parameters': {'count': 3,
-                                              'interval': '10'}}}}
+                                              'interval': 10},
+                               'monitoring_params': {'count': 3,
+                                                  'interval': 10}}}}}
         monitoring = toscautils.get_vdu_monitoring(self.tosca)
         self.assertEqual(monitoring, expected_monitoring)
 

tacker/vm/infra_drivers/heat/heat.py

@@ -109,8 +109,9 @@ class DeviceHeat(abstract_driver.DeviceAbstractDriver):
                     device_template_dict['description'] == ''):
                 device_template_dict['description'] = vnfd_dict.get(
                     'description', '')
-            if (('name' not in device_template_dict or not
+            if (('name' not in device_template_dict or
-            len(device_template_dict['name'])) and ('metadata' in vnfd_dict)):
+                    not len(device_template_dict['name'])) and
+                    'metadata' in vnfd_dict):
                 device_template_dict['name'] = vnfd_dict['metadata'].get(
                     'template_name', '')
 

tacker/vm/tosca/lib/tacker_defs.yaml

@@ -12,19 +12,30 @@ data_types:
         entry_schema:
           type: string
 
+  tosca.datatypes.tacker.MonitoringParams:
+    properties:
+      monitoring_delay:
+        type: int
+      count:
+        type: int
+      interval:
+        type: int
+      timeout:
+        type: int
+      retry:
+        type: int
+      port:
+        type: int
+
   tosca.datatypes.tacker.MonitoringType:
     properties:
       name:
         type: string
         required: true
       actions:
-        type: list
-        entry_schema:
-          type: tosca.datatypes.tacker.ActionMap
-      parameters:
         type: map
-        entry_schema:
+      parameters:
-          type: string
+        type: tosca.datatypes.tacker.MonitoringParams
 
   tosca.datatypes.compute_properties:
     properties:

tacker/vm/tosca/lib/tacker_nfv_defs.yaml

@@ -26,7 +26,8 @@ node_types:
 
       monitoring_policy:
 #        type: tosca.policies.tacker.Monitoring
-        type: tosca.datatypes.tacker.MonitoringType
+#        type: tosca.datatypes.tacker.MonitoringType
+        type: map
 
       config:
         type: string

tacker/vm/tosca/utils.py

@@ -106,7 +106,11 @@ def get_vdu_monitoring(template):
             # mon_data = {mon_policy['name']: {'actions': {'failure':
             #                                              'respawn'}}}
             if mon_policy != 'noop':
-                monitoring_dict['vdus'][nt.name] = mon_policy
+                if 'parameters' in mon_policy:
+                    mon_policy['monitoring_params'] = mon_policy['parameters']
+                monitoring_dict['vdus'][nt.name] = {}
+                monitoring_dict['vdus'][nt.name][mon_policy['name']] = \
+                    mon_policy
     return monitoring_dict