Arbiter WS interface for WS passive checks

Author: mohierf

alignak/http/arbiter_interface.py

@@ -1369,7 +1369,7 @@ def query(self):
     #                     |___/
     #####
     def _build_host_livestate(self, host_name, livestate):
-        # pylint: disable=too-many-locals
+        # pylint: disable=no-self-use, too-many-locals
         """Build and notify the external command for an host livestate
 
         PROCESS_HOST_CHECK_RESULT;<host_name>;<status_code>;<plugin_output>
@@ -1409,7 +1409,7 @@ def _build_host_livestate(self, host_name, livestate):
         return command_line
 
     def _build_service_livestate(self, host_name, service_name, livestate):
-        # pylint: disable=too-many-locals
+        # pylint: disable=no-self-use, too-many-locals
         """Build and notify the external command for a service livestate
 
         PROCESS_SERVICE_CHECK_RESULT;<host_name>;<service_description>;<return_code>;<plugin_output>
@@ -1437,7 +1437,7 @@ def _build_service_livestate(self, host_name, service_name, livestate):
             "UNKNOWN": 3,
             "UNREACHABLE": 4
         }
-        parameters = '%s;%s' % (service_state_to_id.get('state', 3), output)
+        parameters = '%s;%s' % (service_state_to_id.get(state, 3), output)
         if long_output and perf_data:
             parameters = '%s|%s\n%s' % (parameters, perf_data, long_output)
         elif long_output:
@@ -1458,72 +1458,15 @@ def _build_service_livestate(self, host_name, service_name, livestate):
     @cherrypy.tools.json_in()
     @cherrypy.tools.json_out()
     def host(self):
-        """
-        Request object passed to datasource.query function:
-
-        {
-            'timezone': 'browser',
-            'panelId': 38,
-            'range': {
-                'from': '2018-08-29T02:38:09.633Z',
-                'to': '2018-08-29T03:38:09.633Z',
-                'raw': {'from': 'now-1h', 'to': 'now'}
-            },
-            'rangeRaw': {'from': 'now-1h', 'to': 'now'},
-            'interval': '10s',
-            'intervalMs': 10000,
-            'targets': [
-                {
-                    'target': 'problems', 'refId': 'A', 'type': 'table'}
-            ],
-            'format': 'json',
-            'maxDataPoints': 314,
-            'scopedVars': {
-                '__interval': {'text': '10s', 'value': '10s'},
-                '__interval_ms': {'text': 10000, 'value': 10000}
-            }
-        }
-
-        Only the first target is considered. If several targets are required, an error is raised.
-
-        The target is a string that is searched in the target_queries dictionary. If found
-        the corresponding query is executed and the result is returned.
+        # pylint: disable=too-many-branches
+        """Get a passive checks for an host and its services
 
-        Table response from datasource.query. An array of:
+        This function builds the external commands corresponding to the host and services
+        provided information
 
-        [
-          {
-            "type": "table",
-            "columns": [
-              {
-                "text": "Time",
-                "type": "time",
-                "sort": true,
-                "desc": true,
-              },
-              {
-                "text": "mean",
-              },
-              {
-                "text": "sum",
-              }
-            ],
-            "rows": [
-              [
-                1457425380000,
-                null,
-                null
-              ],
-              [
-                1457425370000,
-                1002.76215352,
-                1002.76215352
-              ],
-            ]
-          }
-        ]
-        :return: See upper comment
-        :rtype: list
+        :param host_name: host name
+        :param data: dictionary of the host properties to be modified
+        :return: command line
         """
         logger.debug("Host status...")
         if cherrypy.request.method not in ["PATCH", "POST"]:
@@ -1548,9 +1491,6 @@ def host(self):
         # Get provided data
         # ---
         logger.debug("Posted data: %s", cherrypy.request.json)
-        data = {
-            'host_name': host_name
-        }
 
         # Check if the host exist in Alignak
         # ---
@@ -1627,7 +1567,7 @@ def host(self):
                     ws_result['_issues'].append("Missing state for the service %s/%s livestate, "
                                                 "assuming service is OK!"
                                                 % (host_name, service_name))
-                    ls['state'] = 'UP'
+                    ls['state'] = 'OK'
 
                 # Tag our own timestamp
                 ls['_ws_timestamp'] = now

tests_integ/test_daemons_api.py

@@ -2144,20 +2144,80 @@ def test_host_passive_ws(self):
         # -----
 
         # -----
-        # 2/ Upload an host information
+        # 2/ Upload an host (only) information
         now = int(time.time())
+        # Only the host name, no live state data
         data = {
-            "name": "test_host_0",
+            'name': 'test_host'
+        }
+        raw_data = req.post("http://localhost:7770/host",
+                            data=json.dumps(data),
+                            headers={'Content-Type': 'application/json'}, verify=False)
+        print("command, got (raw): %s" % (raw_data.content))
+        assert raw_data.status_code == 200
+        data = raw_data.json()
+        print("Got: %s" % data)
+        # Status: OK
+        # Host is alive :)
+        # Created and raised an host passive check command
+        # No issues
+        assert data == {
+            u'_status': u'OK',
+            u'_result': [
+                u'test_host is alive :)',
+                u'Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;' % now
+            ],
+            u'_issues': []
+        }
+
+        # Now, with live state data
+        now = int(time.time())
+        data = {
+            "name": "test_host",
             "livestate": {
                 "state": "UP",
                 "output": "Output...",
                 "long_output": "Long output...",
                 "perf_data": "'counter'=1",
             }
         }
+        raw_data = req.post("http://localhost:7770/host",
+                            data=json.dumps(data),
+                            headers={'Content-Type': 'application/json'}, verify=False)
+        print("command, got (raw): %s" % (raw_data.content))
+        assert raw_data.status_code == 200
+        data = raw_data.json()
+        print("Got: %s" % data)
+        # Status: OK
+        # Host is alive :)
+        # Created and raised an host passive check command
+        # No issues
+        assert data == {
+            u'_status': u'OK',
+            u'_result': [
+                u'test_host is alive :)',
+                u"Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;Output...|'counter'=1\nLong output..." % now
+            ],
+            u'_issues': []
+        }
 
+        # -----
+        # 3/ Upload an host and its services information
+        now = int(time.time())
+        # Only the host and its services names, no live state data
         data = {
-            'name': 'test_host'
+            'name': 'test_host',
+            "services": [
+                {
+                    "name": "test_ok_0"
+                },
+                {
+                    "name": "test_ok_1"
+                },
+                {
+                    "name": "test_ok_2"
+                }
+            ]
         }
         raw_data = req.post("http://localhost:7770/host",
                             data=json.dumps(data),
@@ -2168,19 +2228,22 @@ def test_host_passive_ws(self):
         print("Got: %s" % data)
         # Status: OK
         # Host is alive :)
-        # Created and raised an host passive check command
+        # Services are in OK state
+        # Created and raised some host and services passive check command
         # No issues
         assert data == {
             u'_status': u'OK',
             u'_result': [
                 u'test_host is alive :)',
-                u'Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;' % now
+                u'Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;' % now,
+                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_0;0;' % now,
+                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_1;0;' % now,
+                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_2;0;' % now
             ],
             u'_issues': []
         }
 
-        # -----
-        # 2/ Upload an host information
+        # Now, with live state data
         now = int(time.time())
         data = {
             'name': 'test_host',
@@ -2214,20 +2277,6 @@ def test_host_passive_ws(self):
                 },
             ]
         }
-        data = {
-            'name': 'test_host',
-            "services": [
-                {
-                    "name": "test_ok_0"
-                },
-                {
-                    "name": "test_ok_1"
-                },
-                {
-                    "name": "test_ok_2"
-                }
-            ]
-        }
         raw_data = req.post("http://localhost:7770/host",
                             data=json.dumps(data),
                             headers={'Content-Type': 'application/json'}, verify=False)
@@ -2237,16 +2286,16 @@ def test_host_passive_ws(self):
         print("Got: %s" % data)
         # Status: OK
         # Host is alive :)
-        # Created and raised an host passive check command
+        # Created and raised some host and services passive check command
         # No issues
         assert data == {
             u'_status': u'OK',
             u'_result': [
                 u'test_host is alive :)',
-                u'Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;' % now,
-                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_0;3;' % now,
-                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_1;3;' % now,
-                u'Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_2;3;' % now
+                u"Raised: [%s] PROCESS_HOST_CHECK_RESULT;test_host;0;" % now,
+                u"Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_0;0;Output 0|'counter'=0\nLong output 0" % now,
+                u"Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_1;1;Output 1|'counter'=1\nLong output 1" % now,
+                u"Raised: [%s] PROCESS_SERVICE_CHECK_RESULT;test_host;test_ok_2;2;Output 2|'counter'=2\nLong output 2" % now
             ],
             u'_issues': []
         }