Fix selection tester destruction alarm.

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_destroySeleniumTesterKvmInstance.xml

@@ -65,6 +65,7 @@ setup_service = portal.restrictedTraverse(portal.portal_preferences.getPreferred
 portal.portal_catalog.searchAndActivate(\n
   portal_type="Hosting Subscription",\n
   owner=person_reference,\n
+  validation_state="validated",\n
   method_id=\'HostingSubcription_requestDestructionSeleniumTester\',\n
   method_kw={\'tag\': tag},\n
   activate_kw={\'tag\': tag},\n

master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubcription_requestDestructionSeleniumTester.xml

@@ -58,10 +58,18 @@ hosting_subscription = context\n
 \n
 now = DateTime()\n
 \n
-if hosting_subscription.getAggregateRelatedValue(portal_type=\'Sale Order Line\').getParentValue().getDestinationSectionValue().getReference() == \'seleniumtester\' and \\\n
+if hosting_subscription.getDestinationSectionValue().getReference() == \'seleniumtester\' and \\\n
   hosting_subscription.getModificationDate() < (now - 1):\n
-  if hosting_subscription.SoftwareInstance_getStatus() not in [\'Destroyed\', \'Destruction in progress\']:\n
-    hosting_subscription.requestDestroy(comment=\'Requested by clenaup alarm\', activate_kw={\'tag\': tag})\n
+  if hosting_subscription.getSlapState() != "destroy_requested":\n
+    hosting_subscription.requestDestroy(\n
+      software_release=hosting_subscription.getRootSoftwareReleaseUrl(),\n
+      instance_xml=hosting_subscription.getTextContent(),\n
+      software_type=hosting_subscription.getSourceReference(),\n
+      sla_xml=hosting_subscription.getSlaXml(),\n
+      shared=hosting_subscription.getRootSlave(),\n
+      comment=\'Requested by clenaup alarm\', \n
+      activate_kw={\'tag\': tag}\n
+    )\n
 
 
 ]]></string> </value>

master/bt5/vifib_slap/bt/revision

-764
+765
\ No newline at end of file