issue 384 - error on empty peer container (#397)

* checking if config has peers

Signed-off-by: haim-kermany <[email protected]>

* using query_not_executed instead of exception

Signed-off-by: haim-kermany <[email protected]>

* 1. create QueryAnswer for good format
2. handle expected_not_executed on every scheme run

Signed-off-by: haim-kermany <[email protected]>

* returning scan-dir-test-scheme.yaml

Signed-off-by: haim-kermany <[email protected]>

Signed-off-by: haim-kermany <[email protected]>

Author: haim-kermany

nca/NetworkConfig/NetworkConfigQuery.py

@@ -62,6 +62,11 @@ def execute_and_compute_output_in_required_format(self, cmd_line_flag=False):
         and bool indicator if the query was not executed
         :rtype: int, Union[dict, str], bool
         """
+        for config in self.get_configs():
+            if not config.peer_container.get_num_peers():
+                error_msg = f'Error: Network configuration \'{config.name}\' does not have any peers. Can not run Query'
+                query_answer = QueryAnswer(output_result=error_msg, query_not_executed=True)
+                return query_answer.numerical_result, self._handle_output(query_answer), query_answer.query_not_executed
         query_answer = self.execute(cmd_line_flag)
         if self.output_config.outputFormat not in self.get_supported_output_formats():
             return query_answer.numerical_result, '', query_answer.query_not_executed
@@ -95,6 +100,10 @@ def execute(self, cmd_line_flag):
     def get_configs_names(self):
         raise NotImplementedError
 
+    @abstractmethod
+    def get_configs(self):
+        raise NotImplementedError
+
 
 class NetworkConfigQuery(BaseNetworkQuery):
     """
@@ -115,6 +124,13 @@ def get_configs_names(self):
         """
         return [self.config.name]
 
+    def get_configs(self):
+        """
+        returns the config
+        :rtype: list[NetworksConfig]
+        """
+        return [self.config]
+
     @staticmethod
     def get_query_type():
         return QueryType.SingleConfigQuery
@@ -750,6 +766,13 @@ def get_configs_names(self):
         """
         return [self.name1, self.name2]
 
+    def get_configs(self):
+        """
+        returns list of the query's configs
+        :rtype: list[NetworksConfig]
+        """
+        return [self.config1, self.config2]
+
     @staticmethod
     def get_query_type():
         return QueryType.ComparisonToBaseConfigQuery

nca/SchemeRunner.py

@@ -198,12 +198,13 @@ def run_queries(self, query_array):
                 if res != expected:
                     self.warning(f'Unexpected result for query {query_name}: Expected {expected}, got {res}\n', query)
                     self.global_res += 1
-            if 'expectedNotExecuted' in query:
-                expected_not_executed = query['expectedNotExecuted']
-                if not_executed != expected_not_executed:
-                    self.warning(f'{query_name} was not executed {not_executed} times. '
-                                 f'Although, expected to not be executed {expected_not_executed} times')
-                    self.global_res += 1
+            expected_not_executed = query.get('expectedNotExecuted', 0)
+            if not_executed != expected_not_executed:
+                msg = f'{query_name} was not executed {not_executed} times.'
+                if 'expectedNotExecuted' in query:
+                    msg = msg + f' Although, expected to not be executed {expected_not_executed} times'
+                self.warning(msg)
+                self.global_res += 1
             if comparing_err != 0:
                 self.warning(f'Unexpected output comparing result for query {query_name} ')
                 self.global_res += 1

tests/istio_testcases/scan-dir-test-scheme.yaml

@@ -10,4 +10,5 @@ networkConfigList:
 queries:
   - name: test-query
     connectivityMap:
-      - test
+      - test
+    expectedNotExecuted: 1