From 508ce51ff069e51af27ec44ee8b2568feaca421d Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 25 May 2012 10:24:50 +0200 Subject: [PATCH] Unused --- .../ExtensionTemplateItem/VifibSecurity.py | 68 ------------------- ...reInstance_destroySlaveInstanceRelated.xml | 28 -------- ...nce_requestDestroySlaveInstanceRelated.xml | 28 -------- master/bt5/vifib_erp5/bt/revision | 2 +- 4 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_destroySlaveInstanceRelated.xml delete mode 100644 master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_requestDestroySlaveInstanceRelated.xml diff --git a/master/bt5/vifib_erp5/ExtensionTemplateItem/VifibSecurity.py b/master/bt5/vifib_erp5/ExtensionTemplateItem/VifibSecurity.py index 3739c810b..02fed6d74 100644 --- a/master/bt5/vifib_erp5/ExtensionTemplateItem/VifibSecurity.py +++ b/master/bt5/vifib_erp5/ExtensionTemplateItem/VifibSecurity.py @@ -80,74 +80,6 @@ def SoftwareInstance_bangAsSelf(self, relative_url=None, reference=None, # Restore the original user. setSecurityManager(sm) -def SoftwareInstance_requestDestroySlaveInstanceRelated(self): - """ request destroy all Slave Instance allocated in the Computer Partition - related to the Software Instance """ - sm = getSecurityManager() - portal = self.getPortalObject() - service_relative_url = portal.portal_preferences.getPreferredInstanceCleanupResource() - newSecurityManager(None, portal.acl_users.getUserById( - self.getReference())) - computer_partition_relative_url = self.getAggregateRelatedValue( - "Sale Packing List Line").getAggregate(portal_type="Computer Partition") - portal_preferences = portal.portal_preferences - service_uid_list = [ - portal.restrictedTraverse(portal_preferences.getPreferredInstanceHostingResource()).getUid(), - portal.restrictedTraverse(portal_preferences.getPreferredInstanceSetupResource()).getUid(), - ] - try: - result_list = self.portal_catalog(portal_type="Sale Packing List Line", - aggregate_portal_type="Slave Instance", - computer_partition_relative_url=computer_partition_relative_url, - default_resource_uid=service_uid_list) - slave_instance_list = [line.getAggregateValue(portal_type="Slave Instance") for line in result_list] - uid_list = [] - for slave_instance in slave_instance_list: - slave_instance_uid = slave_instance.getUid() - if slave_instance_uid in uid_list: - continue - cleanup_packing_list = self.portal_catalog( - portal_type='Sale Packing List Line', - aggregate_relative_url=slave_instance.getRelativeUrl(), - resource_relative_url=service_relative_url, - limit=1, - ) - if len(cleanup_packing_list) == 0: - uid_list.append(slave_instance_uid) - slave_instance.requestDestroyComputerPartition() - finally: - # Restore the original user. - setSecurityManager(sm) - -def SoftwareInstance_destroySlaveInstanceRelated(self): - """ destroy all Slave Instance allocated in the Computer Partition - related to the Software Instance """ - sm = getSecurityManager() - newSecurityManager(None, self.getPortalObject().acl_users.getUserById( - self.getReference())) - portal = self.getPortalObject() - portal_preferences = portal.portal_preferences - computer_partition_relative_url = self.getAggregateRelatedValue( - "Sale Packing List Line").getAggregate(portal_type="Computer Partition") - simulation_state = ["confirmed"] - service_uid_list = [ - portal.restrictedTraverse(portal_preferences.getPreferredInstanceCleanupResource()).getUid(), - ] - try: - result_list = self.portal_catalog(portal_type="Sale Packing List Line", - aggregate_portal_type="Slave Instance", - computer_partition_relative_url=computer_partition_relative_url, - simulation_state=simulation_state, - default_resource_uid=service_uid_list) - slave_instance_list = [line.getAggregateValue(portal_type="Slave Instance") for line in result_list] - # restore the original user to destroy each Slave Instance - setSecurityManager(sm) - for slave_instance in slave_instance_list: - slave_instance.destroyComputerPartition() - finally: - # Restore the original user. - setSecurityManager(sm) - def getComputerSecurityCategory(self, base_category_list, user_name, object, portal_type): """ diff --git a/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_destroySlaveInstanceRelated.xml b/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_destroySlaveInstanceRelated.xml deleted file mode 100644 index c746bd71e..000000000 --- a/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_destroySlaveInstanceRelated.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_function</string> </key> - <value> <string>SoftwareInstance_destroySlaveInstanceRelated</string> </value> - </item> - <item> - <key> <string>_module</string> </key> - <value> <string>VifibSecurity</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>SoftwareInstance_destroySlaveInstanceRelated</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_requestDestroySlaveInstanceRelated.xml b/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_requestDestroySlaveInstanceRelated.xml deleted file mode 100644 index 423ce11f3..000000000 --- a/master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/SoftwareInstance_requestDestroySlaveInstanceRelated.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <global name="ExternalMethod" module="Products.ExternalMethod.ExternalMethod"/> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_function</string> </key> - <value> <string>SoftwareInstance_requestDestroySlaveInstanceRelated</string> </value> - </item> - <item> - <key> <string>_module</string> </key> - <value> <string>VifibSecurity</string> </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>SoftwareInstance_requestDestroySlaveInstanceRelated</string> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string></string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/master/bt5/vifib_erp5/bt/revision b/master/bt5/vifib_erp5/bt/revision index bc56e7649..66e214a2e 100644 --- a/master/bt5/vifib_erp5/bt/revision +++ b/master/bt5/vifib_erp5/bt/revision @@ -1 +1 @@ -431 \ No newline at end of file +432 \ No newline at end of file -- 2.30.9