Replace root_software_release_url with url_string.

master/bt5/slapos_cloud/PathTemplateItem/hosting_subscription_module/template_hosting_subscription.xml

@@ -137,10 +137,6 @@
             <key> <string>root_slave</string> </key>
             <value> <int>0</int> </value>
         </item>
-        <item>
-            <key> <string>root_software_release_url</string> </key>
-            <value> <string>http://example.com/root/software/release</string> </value>
-        </item>
         <item>
             <key> <string>sla_xml</string> </key>
             <value> <string encoding="cdata"><![CDATA[
@@ -169,6 +165,10 @@
             <key> <string>title</string> </key>
             <value> <string>Template Hosting Subscription</string> </value>
         </item>
+        <item>
+            <key> <string>url_string</string> </key>
+            <value> <string>http://example.com/root/software/release</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

master/bt5/slapos_cloud/PortalTypePropertySheetTemplateItem/property_sheet_list.xml

 <property_sheet_list>
  <portal_type id="Hosting Subscription">
   <item>TextDocument</item>
+  <item>Url</item>
   <item>VariationRange</item>
  </portal_type>
  <portal_type id="Slave Instance">
@@ -18,6 +19,7 @@
   <item>SoftwareInstance</item>
   <item>SoftwareInstanceConstraint</item>
   <item>TextDocument</item>
+  <item>Url</item>
   <item>VariationRange</item>
  </portal_type>
 </property_sheet_list>
\ No newline at end of file

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCorePersonRequest.py

@@ -257,7 +257,7 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
     )
     hosting_subscription = person.REQUEST.get('request_hosting_subscription')
     self.assertEquals(software_release,
-                      hosting_subscription.getRootSoftwareReleaseUrl())
+                      hosting_subscription.getUrlString())
     self.assertEquals(software_title, hosting_subscription.getTitle())
     self.assertEquals(software_type, hosting_subscription.getSourceReference())
     self.assertEquals(instance_xml, hosting_subscription.getTextContent())
@@ -363,7 +363,7 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
                       hosting_subscription2.getReference())
 
     self.assertEquals(software_release2,
-                      hosting_subscription.getRootSoftwareReleaseUrl())
+                      hosting_subscription.getUrlString())
     self.assertEquals(software_title, hosting_subscription.getTitle())
     self.assertEquals(software_type2, hosting_subscription.getSourceReference())
     self.assertEquals(instance_xml2, hosting_subscription.getTextContent())
@@ -474,7 +474,7 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
                       hosting_subscription2.getReference())
 
     self.assertEquals(software_release2,
-                      hosting_subscription2.getRootSoftwareReleaseUrl())
+                      hosting_subscription2.getUrlString())
     self.assertEquals(software_title2, hosting_subscription2.getTitle())
     self.assertEquals(software_type2, hosting_subscription2.getSourceReference())
     self.assertEquals(instance_xml2, hosting_subscription2.getTextContent())

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSCoreSoftwareInstanceRequest.py

@@ -48,7 +48,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     hosting_subscription.edit(
         title=self.request_kw['software_title'],
         reference="TESTHS-%s" % new_id,
-        root_software_release_url=self.request_kw['software_release'],
+        url_string=self.request_kw['software_release'],
         source_reference=self.request_kw['software_type'],
         text_content=self.request_kw['instance_xml'],
         sla_xml=self.request_kw['sla_xml'],
@@ -62,7 +62,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.software_instance.edit(
         title=self.request_kw['software_title'],
         reference="TESTSI-%s" % new_id,
-        root_software_release_url=self.request_kw['software_release'],
+        url_string=self.request_kw['software_release'],
         source_reference=self.request_kw['software_type'],
         text_content=self.request_kw['instance_xml'],
         sla_xml=self.request_kw['sla_xml'],
@@ -146,7 +146,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
                      requested_instance.getSlapState())
     self.assertEqual(request_kw['software_release'],
-                     requested_instance.getRootSoftwareReleaseUrl())
+                     requested_instance.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
                      requested_instance.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -181,7 +181,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
                      requested_instance.getSlapState())
     self.assertEqual(request_kw['software_release'],
-                     requested_instance.getRootSoftwareReleaseUrl())
+                     requested_instance.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
                      requested_instance.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -219,7 +219,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
         requested_instance.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance.getRootSoftwareReleaseUrl())
+        requested_instance.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -253,7 +253,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
         requested_instance.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance.getRootSoftwareReleaseUrl())
+        requested_instance.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -281,7 +281,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
         requested_instance2.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance2.getRootSoftwareReleaseUrl())
+        requested_instance2.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance2.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -490,7 +490,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('start_requested',
         requested_instance.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance.getRootSoftwareReleaseUrl())
+        requested_instance.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -517,7 +517,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('stop_requested',
         requested_instance2.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance2.getRootSoftwareReleaseUrl())
+        requested_instance2.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance2.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -546,7 +546,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual('destroy_requested',
         requested_instance3.getSlapState())
     self.assertEqual(request_kw['software_release'],
-        requested_instance3.getRootSoftwareReleaseUrl())
+        requested_instance3.getUrlString())
     self.assertEqual(request_kw['instance_xml'],
         requested_instance3.getTextContent())
     self.assertEqual(request_kw['sla_xml'],
@@ -760,7 +760,7 @@ class TestSlapOSCoreSoftwareInstanceRequest(testSlapOSMixin):
     self.assertEqual(requested_instance.getRelativeUrl(),
         requested_instance2.getRelativeUrl())
     self.assertEqual(request_kw['software_release'],
-        requested_instance2.getRootSoftwareReleaseUrl())
+        requested_instance2.getUrlString())
     self.assertEqual(bang_amount+1, self._countBang(requested_instance))
 
   def test_request_software_type_bang(self):

master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py

@@ -139,7 +139,7 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
     setupSoftwareInstance(self.start_requested_software_instance, **dict(
         title=self.generateNewSoftwareTitle(),
         reference="TESTSI-%s" % self.generateNewId(),
-        root_software_release_url=\
+        url_string=\
           self.start_requested_software_installation.getUrlString(),
         source_reference=self.generateNewSoftwareType(),
         text_content=self.generateSafeXml(),
@@ -150,7 +150,7 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
     setupSoftwareInstance(self.hosting_subscription, **dict(
         title=self.generateNewSoftwareTitle(),
         reference="TESTSI-%s" % self.generateNewId(),
-        root_software_release_url=\
+        url_string=\
           self.start_requested_software_installation.getUrlString(),
         source_reference=self.generateNewSoftwareType(),
         text_content=self.generateSafeXml(),
@@ -169,7 +169,7 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
     setupSoftwareInstance(self.stop_requested_software_instance, **dict(
         title=self.generateNewSoftwareTitle(),
         reference="TESTSI-%s" % self.generateNewId(),
-        root_software_release_url=\
+        url_string=\
           self.start_requested_software_installation.getUrlString(),
         source_reference=self.generateNewSoftwareType(),
         text_content=self.generateSafeXml(),
@@ -186,7 +186,7 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
     setupSoftwareInstance(self.destroy_requested_software_instance, **dict(
         title=self.generateNewSoftwareTitle(),
         reference="TESTSI-%s" % self.generateNewId(),
-        root_software_release_url=\
+        url_string=\
           self.start_requested_software_installation.getUrlString(),
         source_reference=self.generateNewSoftwareType(),
         text_content=self.generateSafeXml(),
@@ -203,7 +203,7 @@ class TestSlapOSSlapToolMixin(testSlapOSMixin):
     setupSoftwareInstance(self.destroyed_software_instance, **dict(
         title=self.generateNewSoftwareTitle(),
         reference="TESTSI-%s" % self.generateNewId(),
-        root_software_release_url=\
+        url_string=\
           self.start_requested_software_installation.getUrlString(),
         source_reference=self.generateNewSoftwareType(),
         text_content=self.generateSafeXml(),
@@ -458,19 +458,19 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin):
   partition_3_instance_software_type=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_3_timestamp=int(self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
   partition_3_param=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'],
-  partition_3_software_release_url=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getRootSoftwareReleaseUrl(),
+  partition_3_software_release_url=self.computer.partition3.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
 
   partition_2_instance_guid=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
   partition_2_instance_software_type=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_2_timestamp=int(self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
   partition_2_param=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'],
-  partition_2_software_release_url=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getRootSoftwareReleaseUrl(),
+  partition_2_software_release_url=self.computer.partition2.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
 
   partition_1_instance_guid=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getReference(),
   partition_1_instance_software_type=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getSourceReference(),
   partition_1_timestamp=int(self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getModificationDate()),
   partition_1_param=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getInstanceXmlAsDict()['param'],
-  partition_1_software_release_url=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getRootSoftwareReleaseUrl(),
+  partition_1_software_release_url=self.computer.partition1.getAggregateRelatedValue(portal_type='Software Instance').getUrlString(),
   )
 
   def test_getFullComputerInformation(self):
@@ -773,7 +773,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
 """ % dict(
     computer_id=self.computer_id,
     instance_guid=self.start_requested_software_instance.getReference(),
-    software_release_url=self.start_requested_software_instance.getRootSoftwareReleaseUrl(),
+    software_release_url=self.start_requested_software_instance.getUrlString(),
     software_type=self.start_requested_software_instance.getSourceReference(),
     param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'],
     timestamp=int(self.start_requested_software_instance.getModificationDate())
@@ -964,7 +964,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
 """ % dict(
   computer_id=self.computer_id,
   param=self.start_requested_software_instance.getInstanceXmlAsDict()['param'],
-  software_release_url=self.start_requested_software_instance.getRootSoftwareReleaseUrl(),
+  software_release_url=self.start_requested_software_instance.getUrlString(),
   timestamp=int(self.start_requested_software_instance.getModificationDate()),
   instance_guid=self.start_requested_software_instance.getReference(),
   software_type=self.start_requested_software_instance.getSourceReference()

master/bt5/slapos_cloud/WorkflowTemplateItem/portal_workflow/instance_slap_interface_workflow/scripts/RequestedInstance_updateParameterInformation.xml

@@ -67,7 +67,7 @@ except KeyError:\n
   raise TypeError, "RequestedInstance_updateParameterInformation takes exactly 5 arguments"\n
 \n
 edit_kw = {\n
-  \'root_software_release_url\': software_release_url_string,\n
+  \'url_string\': software_release_url_string,\n
   \'text_content\': instance_xml,\n
   \'source_reference\': software_type,\n
   \'sla_xml\': sla_xml,\n

master/bt5/slapos_cloud/bt/revision

-95
\ No newline at end of file
+96
\ No newline at end of file

master/bt5/slapos_cloud/bt/template_portal_type_property_sheet_list

 Hosting Subscription | TextDocument
+Hosting Subscription | Url
 Hosting Subscription | VariationRange
 Slave Instance | Reference
 Slave Instance | SlaveInstanceConstraint
@@ -10,4 +11,5 @@ Software Instance | Reference
 Software Instance | SoftwareInstance
 Software Instance | SoftwareInstanceConstraint
 Software Instance | TextDocument
+Software Instance | Url
 Software Instance | VariationRange
\ No newline at end of file

master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/ComputerPartition_getAvailableSoftwareReleaseUrlStringList.xml

@@ -68,7 +68,7 @@ elif slap_state == \'busy\':\n
   if (instance is None) or (instance.getSlapState() != "start_requested"):\n
     return []\n
   else:\n
-    return [instance.getRootSoftwareReleaseUrl()]\n
+    return [instance.getUrlString()]\n
 \n
 else:\n
   return []\n

master/bt5/vifib_base/bt/revision

-506
\ No newline at end of file
+507
\ No newline at end of file

master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibHostingSubscriptionConstraint/instance_property_constraint.xml

@@ -24,7 +24,7 @@
               <tuple>
                 <string>source_reference</string>
                 <string>root_slave</string>
-                <string>root_software_release_url</string>
+                <string>url_string</string>
               </tuple>
             </value>
         </item>

master/bt5/vifib_erp5/bt/revision

-519
\ No newline at end of file
+520
\ No newline at end of file

master/bt5/vifib_open_trade/PropertySheetTemplateItem/portal_property_sheets/HostingSubscription/root_software_release_url_property.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="Standard Property" module="erp5.portal_type"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>categories</string> </key>
-            <value>
-              <tuple>
-                <string>elementary_type/string</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>root_software_release_url_property</string> </value>
-        </item>
-        <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Standard Property</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

master/bt5/vifib_open_trade/SkinTemplateItem/portal_skins/vifib_open_trade/OpenSaleOrderLine_getDefaultImageAbsoluteUrl.xml

@@ -55,7 +55,7 @@ portal = context.getPortalObject()\n
 \n
 release = portal.portal_catalog.getResultValue(\n
   portal_type="Software Release",\n
-  url_string=subscription_item.getRootSoftwareReleaseUrl(),\n
+  url_string=subscription_item.getUrlString(),\n
 )\n
 if release is not None:\n
   software_product = release.getAggregateValue()\n

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

@@ -63,7 +63,7 @@ if hosting_subscription.getDestinationSectionValue().getReference() == \'seleniu
 \n
   person = hosting_subscription.getDestinationSectionValue(portal_type="Person")\n
   person.requestSoftwareInstance(\n
-    software_release=hosting_subscription.getRootSoftwareReleaseUrl(),\n
+    software_release=hosting_subscription.getUrlString(),\n
     instance_xml=hosting_subscription.getTextContent(),\n
     software_type=hosting_subscription.getSourceReference(),\n
     sla_xml=hosting_subscription.getSlaXml(),\n

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

@@ -58,7 +58,7 @@
   return\n
 \n
 context.requestInstance(\n
-  software_release=context.getRootSoftwareReleaseUrl(),\n
+  software_release=context.getUrlString(),\n
   software_title=context.getTitle(),\n
   software_type=context.getSourceReference(),\n
   instance_xml=context.getTextContent(),\n

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

@@ -70,7 +70,7 @@ if (instance.getSlapState() != "destroy_requested"):\n
           (instance.getPortalType(), instance.getRelativeUrl())\n
 \n
       requester.requestInstance(\n
-        software_release=instance.getRootSoftwareReleaseUrl(),\n
+        software_release=instance.getUrlString(),\n
         software_title=instance.getTitle(),\n
         software_type=instance.getSourceReference(),\n
         instance_xml=instance.getTextContent(),\n

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

@@ -66,7 +66,7 @@ portal = context.getPortalObject()\n
 order = context.getParentValue()\n
 if state in [\'planned\', \'ordered\']:\n
   instance = context.getAggregateValue(portal_type=[\'Software Instance\', \'Slave Instance\'])\n
-  instance_software_release_url = instance.getRootSoftwareReleaseUrl()\n
+  instance_software_release_url = instance.getUrlString()\n
   line_software_release_document = context.getAggregateValue(portal_type=\'Software Release\')\n
   line_software_release_url = \'\'\n
   if line_software_release_document is not None:\n

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

@@ -64,7 +64,7 @@ promise_kw = {\n
   \'instance_xml\': context.getTextContent(),\n
   \'software_type\': context.getSourceReference(),\n
   \'sla_xml\': context.getSlaXml(),\n
-  \'software_release\': context.getRootSoftwareReleaseUrl(),\n
+  \'software_release\': context.getUrlString(),\n
   \'shared\': (context.getPortalType() == \'Slave Instance\'),\n
 }\n
 \n

master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/change_instance_parameter.xml

@@ -56,7 +56,7 @@
             <key> <string>method_id</string> </key>
             <value>
               <list>
-                <string>_setRootSoftwareReleaseUrl</string>
+                <string>_setUrlString</string>
                 <string>_setTextContent</string>
                 <string>_setSourceReference</string>
                 <string>_setSlaXml</string>

master/bt5/vifib_slap/bt/revision

-853
\ No newline at end of file
+854
\ No newline at end of file

master/bt5/vifib_slapos_accounting/WorkflowTemplateItem/portal_workflow/instance_accounting_slap_interaction_workflow/interactions/change_instance_parameter.xml

@@ -56,7 +56,7 @@
             <key> <string>method_id</string> </key>
             <value>
               <list>
-                <string>_setRootSoftwareReleaseUrl</string>
+                <string>_setUrlString</string>
                 <string>_setTextContent</string>
                 <string>_setSourceReference</string>
                 <string>_setSlaXml</string>

master/bt5/vifib_slapos_accounting/WorkflowTemplateItem/portal_workflow/instance_accounting_slap_interaction_workflow/scripts/Instance_changePromiseParameter.xml

@@ -63,9 +63,9 @@ if (state in (started, stopped)):\n
     delivery = instance.getCausalityValue(portal_type=["Sale Packing List"])\n
     update_service_relative_url = portal.portal_preferences.getPreferredInstanceUpdateResource()\n
 \n
-    software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getRootSoftwareReleaseUrl())\n
+    software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getUrlString())\n
     if software_release_document is None:\n
-      raise NotImplemnetedError(\'Software Release %r not ready yet\' % instance.getRootSoftwareReleaseUrl())\n
+      raise NotImplemnetedError(\'Software Release %r not ready yet\' % instance.getUrlString())\n
     if delivery is None:\n
       new_delivery = context.Instance_createSalePackingList(state_change, portal.restrictedTraverse(update_service_relative_url), software_release_document)\n
     else:\n

master/bt5/vifib_slapos_accounting/WorkflowTemplateItem/portal_workflow/instance_accounting_slap_interaction_workflow/scripts/Instance_changePromiseState.xml

@@ -122,9 +122,9 @@ else:\n
       if (packing_list  is not None):\n
         instance.edit(causality_value=packing_list)\n
     else:\n
-      software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getRootSoftwareReleaseUrl())\n
+      software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getUrlString())\n
       if software_release_document is None:\n
-        raise NotImplemnetedError(\'Software Release %r not ready yet\' % instance.getRootSoftwareReleaseUrl())\n
+        raise NotImplemnetedError(\'Software Release %r not ready yet\' % instance.getUrlString())\n
       # Create a new packing list from scratch\n
       if (state == started):\n
         service_relative_url = hosting_service_relative_url\n
@@ -149,9 +149,9 @@ else:\n
     service_relative_url = line.getResource()\n
 \n
     def letsclone(service_relative_url):\n
-      software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getRootSoftwareReleaseUrl())\n
+      software_release_document = instance.Base_getSoftwareReleaseDocument(instance.getUrlString())\n
       if software_release_document is None:\n
-        raise NotImplementedError(\'Software Release %r not ready yet\' % instance.getRootSoftwareReleaseUrl())\n
+        raise NotImplementedError(\'Software Release %r not ready yet\' % instance.getUrlString())\n
       new_delivery = delivery.Base_createCloneDocument(batch_mode=1)\n
       new_delivery.edit(start_date=DateTime(), stop_date=DateTime(), causality_value=None)\n
       delivery_line = new_delivery.contentValues(portal_type="Sale Packing List Line")[0]\n

master/bt5/vifib_slapos_accounting/bt/revision

-33
+34
\ No newline at end of file

master/bt5/vifib_slapos_capacity/SkinTemplateItem/portal_skins/vifib_slapos_capacity/Computer_checkAndDesactivatePartitionList.xml

@@ -103,7 +103,7 @@ if can_allocate:\n
 \n
     instance = instance.getObject()\n
 \n
-    software_release_url = instance.getRootSoftwareReleaseUrl()\n
+    software_release_url = instance.getUrlString()\n
     if software_release_url in software_release_capacity_dict:\n
       software_release_capacity = software_release_capacity_dict[software_release_url]\n
     else:\n

master/bt5/vifib_slapos_capacity/bt/revision

-13
\ No newline at end of file
+14
\ No newline at end of file

master/bt5/vifib_slapos_rest_api_v1/DocumentTemplateItem/portal_components/VifibRestAPIV1.py

@@ -451,7 +451,7 @@ class InstancePublisher(GenericPublisher):
         d = {
           "title": software_instance.getTitle(),
           "status": software_instance.getSlapState(),
-          "software_release": software_instance.getRootSoftwareReleaseUrl(),
+          "software_release": software_instance.getUrlString(),
           "software_type": software_instance.getSourceReference(),
           "slave": software_instance.getPortalType() == 'Slave Instance',
           "connection": software_instance.getConnectionXmlAsDict(),

master/bt5/vifib_slapos_rest_api_v1/bt/revision

-21
\ No newline at end of file
+22
\ No newline at end of file

master/bt5/vifib_slapos_rest_api_v1_test/TestTemplateItem/testVifibSlaposRestAPIV1.py

@@ -519,7 +519,7 @@ class VifibSlaposRestAPIV1InstanceMixin(VifibSlaposRestAPIV1Mixin):
       reference='SI' + self.test_random_id,
       ssl_key='SSL Key',
       ssl_certificate='SSL Certificate',
-      root_software_release_url='http://url.of.software.release/'
+      url_string='http://url.of.software.release/'
     )
     software_instance.validate()
     hosting_subscription.edit(

master/bt5/vifib_slapos_rest_api_v1_test/bt/revision

-85
\ No newline at end of file
+86
\ No newline at end of file

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_getDefaultImageAbsoluteUrl.xml

@@ -55,7 +55,7 @@ portal = context.getPortalObject()\n
 \n
 release = portal.portal_catalog.getResultValue(\n
   portal_type="Software Release",\n
-  url_string=subscription_item.getRootSoftwareReleaseUrl(),\n
+  url_string=subscription_item.getUrlString(),\n
 )\n
 if release is not None:\n
   software_product = release.getAggregateValue()\n

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_requestPerson.xml

@@ -58,7 +58,7 @@ if state is None:\n
 person = context.getDestinationSectionValue()\n
 person.requestSoftwareInstance(\n
   state=state,\n
-  software_release=context.getRootSoftwareReleaseUrl(),\n
+  software_release=context.getUrlString(),\n
   software_title=context.getTitle(),\n
   software_type=context.getSourceReference(),\n
   instance_xml=instance_xml,\n

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/HostingSubscription_viewAsWeb.xml

@@ -101,7 +101,7 @@
                     <value>
                       <list>
                         <string>my_title</string>
-                        <string>my_root_software_release_url</string>
+                        <string>my_url_string</string>
                         <string>my_source_reference</string>
                         <string>last_event_listbox</string>
                         <string>my_translated_slap_state_title</string>

master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareInstance_viewAsWeb.xml

@@ -92,7 +92,7 @@
                         <string>my_title</string>
                         <string>your_new_title</string>
                         <string>my_update_button</string>
-                        <string>my_root_software_release_url</string>
+                        <string>my_url_string</string>
                         <string>my_source_reference</string>
                         <string>your_status</string>
                         <string>your_monitoring_status_js</string>

master/bt5/vifib_web/bt/revision

-477
\ No newline at end of file
+478
\ No newline at end of file

master/product/Vifib/Tool/SlapTool.py

@@ -663,7 +663,7 @@ class SlapTool(BaseTool):
         slap_partition._requested_state = 'started'
 
       slap_partition._software_release_document = SoftwareRelease(
-            software_release=software_instance.getRootSoftwareReleaseUrl(),
+            software_release=software_instance.getUrlString(),
             computer_guid=computer_reference)
 
       slap_partition._need_modification = 1
@@ -799,7 +799,7 @@ class SlapTool(BaseTool):
         slap_partition._requested_state = 'started'
 
       slap_partition._software_release_document = SoftwareRelease(
-            software_release=software_instance.getRootSoftwareReleaseUrl(),
+            software_release=software_instance.getUrlString(),
             computer_guid=computer_id)
 
       slap_partition._need_modification = 1
@@ -1395,7 +1395,7 @@ class SlapTool(BaseTool):
       'slap_computer_id': computer_partition.getParentValue().getReference(),
       'slap_computer_partition_id': computer_partition.getReference(),
       'slap_software_type': software_instance.getSourceReference(),
-      'slap_software_release_url': software_instance.getRootSoftwareReleaseUrl(),
+      'slap_software_release_url': software_instance.getUrlString(),
       'slave_instance_list': slave_instance_list,
       'ip_list': ip_list,
       'timestamp': "%i" % timestamp,

master/product/Vifib/tests/testVifibSlapBang.py

@@ -654,7 +654,7 @@ class TestVifibSlapBang(TestVifibSlapWebServiceMixin):
 
     self.login(sequence['software_instance_reference'])
     root_software_instance.requestDestroy(
-        software_release=root_software_instance.getRootSoftwareReleaseUrl(),
+        software_release=root_software_instance.getUrlString(),
         instance_xml=root_software_instance.getTextContent(),
         software_type=root_software_instance.getSourceReference(),
         sla_xml=root_software_instance.getSlaXml(),

master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py

@@ -23,7 +23,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
         'destroy_requested': instance.requestDestroy,
         }
     method_dict[instance.getSlapState()](
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml='<?xml version="1.0" ' \
                      'encoding="utf-8"?><instance><parameter id="foo">bar</parameter></instance>',
         software_type=instance.getSourceReference(),
@@ -435,7 +435,7 @@ class TestVifibSlapComputerPartitionUpdate(TestVifibSlapWebServiceMixin):
         }
     self.assertRaises(UnsupportedWorkflowMethod, 
         method_dict[instance.getSlapState()],
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),

master/product/Vifib/tests/testVifibSlapWebService.py

@@ -562,7 +562,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestDestroy(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -580,7 +580,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     self.assertRaises(UnsupportedWorkflowMethod, instance.requestDestroy, 
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -597,7 +597,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStart(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -614,7 +614,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStop(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -2752,7 +2752,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestDestroy(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -2769,7 +2769,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStart(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -2787,7 +2787,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStop(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -2880,7 +2880,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStart(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),
@@ -2897,7 +2897,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     else:
       raise NotImplementedError
     instance.requestStop(
-        software_release=instance.getRootSoftwareReleaseUrl(),
+        software_release=instance.getUrlString(),
         instance_xml=instance.getTextContent(),
         software_type=instance.getSourceReference(),
         sla_xml=instance.getSlaXml(),