Change the software_instance_tree table

- Use Hosting Subscribtion as root
- Rename 'SoftwareInstance_getSoftwareInstanceUid' into
  'SoftwareInstance_getHostingSubscriptionUid' to have a meanful name.

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/SoftwareInstance_getRootSoftwareInstanceUid.xml → master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/SoftwareInstance_getRootHostingSubscriptionUid.xml

@@ -50,12 +50,27 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>predecessor_software_instance = context\n
+            <value> <string># Did not import Products.ERP5Security.ERP5GroupManager\n
+# because of semantic matter.\n
+class ConsistencyError(Exception):\n
+  pass\n
+\n
+predecessor_software_instance = context\n
 while (predecessor_software_instance is not None):\n
   root_software_instance = predecessor_software_instance\n
   predecessor_software_instance = predecessor_software_instance.getPredecessorRelatedValue(\n
     portal_type=["Software Instance", "Slave Instance"])\n
-return root_software_instance.getUid()\n
+\n
+root_hosting_subscription = root_software_instance.getPredecessorRelatedValue(\n
+  portal_type=["Hosting Subscription"])\n
+\n
+# XXX-Antoine: As Romain wanted it, we raise an error if it\'s not attached to a\n
+#              root Hosting Subscription.\n
+if root_hosting_subscription is None:\n
+  raise ConsistencyError(("Software instance %s has no hosting "\n
+                          "subscription as root.") % context.getReference())\n
+\n
+return root_hosting_subscription.getUid()\n
 </string> </value>
         </item>
         <item>
@@ -64,7 +79,7 @@ return root_software_instance.getUid()\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>SoftwareInstance_getRootSoftwareInstanceUid</string> </value>
+            <value> <string>SoftwareInstance_getRootHostingSubscriptionUid</string> </value>
         </item>
       </dictionary>
     </pickle>

master/bt5/vifib_base/bt/revision

-326
\ No newline at end of file
+327
\ No newline at end of file

master/bt5/vifib_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_software_instance_list.xml

@@ -15,7 +15,7 @@
         <item>
             <key> <string>arguments_src</string> </key>
             <value> <string>uid\r\n
-SoftwareInstance_getRootSoftwareInstanceUid</string> </value>
+SoftwareInstance_getRootHostingSubscriptionUid</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -69,7 +69,7 @@ WHERE\n
   <dtml-in prefix="loop" expr="_.range(_.len(uid))">\n
     <dtml-call expr="row_list.append([\n
                 uid[loop_item],\n
-                SoftwareInstance_getRootSoftwareInstanceUid[loop_item]])">\n
+                SoftwareInstance_getRootHostingSubscriptionUid[loop_item]])">\n
   </dtml-in>\n
 \n
   <dtml-if "row_list">\n

master/bt5/vifib_mysql_innodb_catalog/bt/revision

-32
\ No newline at end of file
+33
\ No newline at end of file