Merge "Fixed Basic optim tempest test"

watcher/api/controllers/v1/audit.py

@@ -71,11 +71,11 @@ class AuditPostType(wtypes.Base):
             raise exception.AuditTypeNotFound(audit_type=self.audit_type)
 
         if (self.audit_type == objects.audit.AuditType.ONESHOT.value and
-           self.interval != wtypes.Unset):
+                self.interval not in (wtypes.Unset, None)):
             raise exception.AuditIntervalNotAllowed(audit_type=self.audit_type)
 
         if (self.audit_type == objects.audit.AuditType.CONTINUOUS.value and
-           self.interval == wtypes.Unset):
+           self.interval in (wtypes.Unset, None)):
             raise exception.AuditIntervalNotSpecified(
                 audit_type=self.audit_type)
 

watcher/common/messaging/messaging_handler.py

@@ -79,7 +79,7 @@ class MessagingHandler(threading.Thread):
     def build_server(self, target):
         return om.get_rpc_server(self.__transport, target,
                                  self.__endpoints,
-                                 executor='evenlet',
+                                 executor='eventlet',
                                  serializer=self.__serializer)
 
     def _configure(self):

watcher/decision_engine/strategy/strategies/basic_consolidation.py

@@ -482,6 +482,6 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy):
 
     def post_execute(self):
         self.solution.set_efficacy_indicators(
-            released_compute_nodes_count=self.number_of_migrations,
-            vm_migrations_count=self.number_of_released_nodes,
+            released_compute_nodes_count=self.number_of_released_nodes,
+            vm_migrations_count=self.number_of_migrations,
         )

watcher/tests/common/messaging/test_messaging_handler.py

@@ -58,7 +58,7 @@ class TestMessagingHandler(base.TestCase):
             handler.transport,
             m_target,
             [self.ENDPOINT],
-            executor='evenlet',
+            executor='eventlet',
             serializer=None,
         )