Commit 605ee2ea authored by Romain Courteaud's avatar Romain Courteaud

Do not hardcode the same parameters in multiple places.

parent 024e6407
...@@ -50,17 +50,7 @@ ...@@ -50,17 +50,7 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string>portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
\n
if not instance_xml:\n
instance_xml = """<?xml version="1.0" encoding="utf-8"?>\n
<instance>\n
<parameter id="nbd_ip">2a01:e35:2e27:460:e2cb:4eff:fed9:48dc</parameter>\n
<parameter id="nbd_port">1024</parameter>\n
</instance>\n
"""\n
\n \n
if not service_title:\n if not service_title:\n
service_title = "Vifib KVM %i" % portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1),\n service_title = "Vifib KVM %i" % portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1),\n
...@@ -84,9 +74,7 @@ person.requestSoftwareInstance(**request_kw)\n ...@@ -84,9 +74,7 @@ person.requestSoftwareInstance(**request_kw)\n
\n \n
message = context.Base_translateString("Your instance is under creation. Please wait few minutes for partitions to appear.")\n message = context.Base_translateString("Your instance is under creation. Please wait few minutes for partitions to appear.")\n
return context.REQUEST.get(\'request_hosting_subscription\').Base_redirect(keep_items={\'portal_status_message\': message})\n return context.REQUEST.get(\'request_hosting_subscription\').Base_redirect(keep_items={\'portal_status_message\': message})\n
</string> </value>
]]></string> </value>
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
......
...@@ -213,8 +213,6 @@ ...@@ -213,8 +213,6 @@
<?xml version="1.0" encoding="utf-8"?>\n <?xml version="1.0" encoding="utf-8"?>\n
<instance>\n <instance>\n
<parameter id="nbd_ip">2a01:e35:2e27:460:e2cb:4eff:fed9:48dc</parameter>\n
<parameter id="nbd_port">1024</parameter>\n
</instance> </instance>
]]></string> </value> ]]></string> </value>
......
...@@ -213,8 +213,6 @@ ...@@ -213,8 +213,6 @@
<?xml version="1.0" encoding="utf-8"?>\n <?xml version="1.0" encoding="utf-8"?>\n
<instance>\n <instance>\n
<parameter id="nbd_ip">2a01:e35:2e27:460:e2cb:4eff:fed9:48dc</parameter>\n
<parameter id="nbd_port">1024</parameter>\n
</instance> </instance>
]]></string> </value> ]]></string> </value>
......
380 381
\ 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