Commit 75b3d3ab authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_accounting: If cloud_contract is disable the alarm is skipped.

parent 540ea246
...@@ -29,7 +29,9 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S ...@@ -29,7 +29,9 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
def test_alarm_software_instance_unallocated(self): def test_alarm_software_instance_unallocated(self):
self._makeTree() self._makeTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._simulateSoftwareInstance_requestValidationPayment() self._simulateSoftwareInstance_requestValidationPayment()
try: try:
self.portal.portal_alarms.slapos_contract_request_validation_payment.activeSense() self.portal.portal_alarms.slapos_contract_request_validation_payment.activeSense()
...@@ -42,6 +44,24 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S ...@@ -42,6 +44,24 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
def test_alarm_slave_instance_unallocated(self): def test_alarm_slave_instance_unallocated(self):
self._makeSlaveTree() self._makeSlaveTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._simulateSoftwareInstance_requestValidationPayment()
try:
self.portal.portal_alarms.slapos_contract_request_validation_payment.activeSense()
self.tic()
finally:
self._dropSoftwareInstance_requestValidationPayment()
self.assertEqual(
'Visited by SoftwareInstance_requestValidationPayment',
self.software_instance.workflow_history['edit_workflow'][-1]['comment'])
def test_alarm_software_instance_unallocated_disable_cloud_contract(self):
self._makeTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(False)
self.tic()
self._simulateSoftwareInstance_requestValidationPayment() self._simulateSoftwareInstance_requestValidationPayment()
try: try:
...@@ -53,9 +73,27 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S ...@@ -53,9 +73,27 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
'Visited by SoftwareInstance_requestValidationPayment', 'Visited by SoftwareInstance_requestValidationPayment',
self.software_instance.workflow_history['edit_workflow'][-1]['comment']) self.software_instance.workflow_history['edit_workflow'][-1]['comment'])
def test_alarm_slave_instance_unallocated_disable_cloud_contract(self):
self._makeSlaveTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(False)
self.tic()
self._simulateSoftwareInstance_requestValidationPayment()
try:
self.portal.portal_alarms.slapos_contract_request_validation_payment.activeSense()
self.tic()
finally:
self._dropSoftwareInstance_requestValidationPayment()
self.assertNotEqual(
'Visited by SoftwareInstance_requestValidationPayment',
self.software_instance.workflow_history['edit_workflow'][-1]['comment'])
def test_alarm_software_instance_allocated(self): def test_alarm_software_instance_allocated(self):
self._makeTree() self._makeTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._makeComputer() self._makeComputer()
self.software_instance.setAggregate(self.partition.getRelativeUrl()) self.software_instance.setAggregate(self.partition.getRelativeUrl())
self.tic() self.tic()
...@@ -71,7 +109,9 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S ...@@ -71,7 +109,9 @@ portal_workflow.doActionFor(context, action='edit_action', comment='Visited by S
def test_alarm_slave_instance_allocated(self): def test_alarm_slave_instance_allocated(self):
self._makeSlaveTree() self._makeSlaveTree()
preference = self.portal.portal_preferences.getActiveSystemPreference()
preference.setPreferredCloudContractEnabled(True)
self.tic()
self._makeComputer() self._makeComputer()
self.software_instance.setAggregate(self.partition.getRelativeUrl()) self.software_instance.setAggregate(self.partition.getRelativeUrl())
self.tic() self.tic()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment