Commit 9c2cd8a1 authored by Romain Courteaud's avatar Romain Courteaud

Hosting Subscription should be archived during destruction.

parent 7b57aa0e
...@@ -98,6 +98,7 @@ hosting_subscription.requestDestroy(\n ...@@ -98,6 +98,7 @@ hosting_subscription.requestDestroy(\n
state=\'destroyed\',\n state=\'destroyed\',\n
comment="Garbage collect %s not allocated for more than 1 week" % instance.getRelativeUrl(),\n comment="Garbage collect %s not allocated for more than 1 week" % instance.getRelativeUrl(),\n
)\n )\n
hosting_subscription.archive()\n
]]></string> </value> ]]></string> </value>
......
...@@ -1447,6 +1447,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(testSlapOSMixin): ...@@ -1447,6 +1447,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(testSlapOSMixin):
instance.Instance_tryToGarbageCollectNonAllocatedRootTree() instance.Instance_tryToGarbageCollectNonAllocatedRootTree()
self.assertEqual('destroy_requested', hosting_subscription.getSlapState()) self.assertEqual('destroy_requested', hosting_subscription.getSlapState())
self.assertEqual('archived', hosting_subscription.getValidationState())
def _simulateInstance_tryToGarbageCollectNonAllocatedRootTree(self): def _simulateInstance_tryToGarbageCollectNonAllocatedRootTree(self):
script_name = 'Instance_tryToGarbageCollectNonAllocatedRootTree' script_name = 'Instance_tryToGarbageCollectNonAllocatedRootTree'
......
267 268
\ No newline at end of file \ No newline at end of file
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