Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Roque
slapos.core
Commits
00954e1f
Commit
00954e1f
authored
Sep 18, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into slapgrid_test
parents
59ccce27
79f6c04a
Changes
20
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
1536 additions
and
27 deletions
+1536
-27
CHANGES.txt
CHANGES.txt
+6
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml
...kins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml
+49
-9
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
...skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
+43
-3
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml
...skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml
+10
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_computer_guid.xml
.../SoftwareRelease_viewRequestDialog/your_computer_guid.xml
+277
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml
...sting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml
.../SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml
...sting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_local_area_network_type.xml
...elease_viewRequestDialog/your_local_area_network_type.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_size.xml
...ng/SoftwareRelease_viewRequestDialog/your_memory_size.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_type.xml
...ng/SoftwareRelease_viewRequestDialog/your_memory_type.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml
...twareRelease_viewRequestDialog/your_monitoring_status.xml
+1
-1
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_capacity.xml
...ftwareRelease_viewRequestDialog/your_storage_capacity.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_interface.xml
...twareRelease_viewRequestDialog/your_storage_interface.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_redundancy.xml
...wareRelease_viewRequestDialog/your_storage_redundancy.xml
+126
-0
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml
...g/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml
+4
-2
master/bt5/vifib_web/bt/revision
master/bt5/vifib_web/bt/revision
+1
-1
setup.py
setup.py
+1
-1
slapos/format.py
slapos/format.py
+1
-1
slapos/tests/slapformat.py
slapos/tests/slapformat.py
+9
-9
No files found.
CHANGES.txt
View file @
00954e1f
Changes
Changes
=======
=======
0.28.9 (2012-09-18)
-------------------
* slapgrid: Don't process not updated partitions (regression introduced in
0.28.7). [Cedric de Saint Martin]
0.28.8 (2012-09-18)
0.28.8 (2012-09-18)
-------------------
-------------------
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml
View file @
00954e1f
...
@@ -56,17 +56,53 @@ tool = context.getPortalObject().portal_vifib_rest_api\n
...
@@ -56,17 +56,53 @@ tool = context.getPortalObject().portal_vifib_rest_api\n
return """\n
return """\n
<script>
\n
<script>
\n
$(document).ready(function () {\n
$(document).ready(function () {\n
var current_context = $(".allocable_to_check"),\n
var context = $(".allocable_to_check"),\n
checkallocable;\n
checkallocable,\n
timer,\n
xhr,\n
key, i,\n
sla_key_list;\n
\n
\n
checkallocable = function (context) {\n
sla_key_list = [\n
$.vifiballocable({\n
\'cpu_core\',\n
\'cpu_frequency\',\n
\'cpu_type\',\n
\'local_area_network_type\',\n
\'memory_size\',\n
\'memory_type\',\n
\'storage_capacity\',\n
\'storage_interface\',\n
\'storage_redundancy\',\n
\'computer_guid\',\n
];\n
\n
checkallocable = function () {\n
var context = $(".allocable_to_check"),\n
sla = {}, val;\n
\n
if (timer !== undefined) {\n
clearTimeout(timer);\n
}\n
if (xhr !== undefined) {\n
xhr.abort();\n
}\n
\n
for (i=0; i
<sla_key_list.length
;
i+=1)
{\n
key =
sla_key_list[i];\n
val =
$(\'[name="field_your_\'
+
key
+
\'"]\').val();\n
if
(val)
{\n
sla[key]
=
val;\n
}\n
}\n
\n
context.text("checking...");\n
xhr =
$.vifiballocable({\n
context:
context,\n
context:
context,\n
url:
\'%s/v1/instance/request\',
\n
url:
\'%s/v1/instance/request\',
\n
slave:
false,
\n
slave:
false,
\n
software_release:
context.attr("data-url"),
\n
software_release:
context.attr("data-url"),
\n
software_type:
"default",
\n
software_type:
"default",
\n
sla:
{}
,\n
sla:
sla
,\n
success:
function(data)
{\n
success:
function(data)
{\n
if
(
data.result =
==
true)
{\n
if
(
data.result =
==
true)
{\n
$(this).text("There
is
space!");\n
$(this).text("There
is
space!");\n
...
@@ -78,14 +114,18 @@ $(document).ready(function () {\n
...
@@ -78,14 +114,18 @@ $(document).ready(function () {\n
$(this).text("Unable
to
check
if
there
is
space");\n
$(this).text("Unable
to
check
if
there
is
space");\n
},
\n
},
\n
complete:
function
()
{\n
complete:
function
()
{\n
var context = $(this);\n
timer =
setTimeout(function()
{\n
setTimeout(function() {\n
checkallocable();\n
checkallocable(context);\n
},
60000);\n
},
60000);\n
},\n
},\n
});\n
});\n
};\n
};\n
checkallocable(current_context);\n
for
(
i=
0;
i<sla_key_list.length;
i+=1)
{\n
key =
sla_key_list[i];\n
$(\'[
name=
"field_your_\' + key + \'"
]\').change(checkallocable);\n
}\n
\n
checkallocable();\n
});\n
});\n
\n
\n
\n
\n
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml
View file @
00954e1f
...
@@ -50,11 +50,26 @@
...
@@ -50,11 +50,26 @@
</item>
</item>
<item>
<item>
<key>
<string>
_body
</string>
</key>
<key>
<string>
_body
</string>
</key>
<value>
<string>
portal = context.getPortalObject()\n
<value>
<string
encoding=
"cdata"
>
<![CDATA[
portal = context.getPortalObject()\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
\n
\n
hosting_subscription = portal.portal_catalog.getResultValue(\n
portal_type=\'Hosting Subscription\',\n
validation_state="validated",\n
select_expression=\'title\',\n
title={\'query\': service_title, \'key\': \'ExactMatch\'}\n
)\n
\n
if hosting_subscription is not None:\n
return context.Base_redirect(dialog_id,\n
keep_items={\'portal_status_message\':context.Base_translateString(\n
"You already have service named ${service_title}. Please choose different unique name.", mapping={\'service_title\': service_title})})\n
\n
\n
url = context.getUrlString()\n
url = context.getUrlString()\n
\n
\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
...
@@ -70,15 +85,40 @@ request_kw.update(\n
...
@@ -70,15 +85,40 @@ request_kw.update(\n
state="started",\n
state="started",\n
)\n
)\n
\n
\n
sla_xml = ""\n
\n
for sla_category_id, sla_category in [\n
(\'cpu_core\', cpu_core),\n
(\'cpu_frequency\', cpu_frequency),\n
(\'cpu_type\', cpu_type),\n
(\'local_area_network_type\', local_area_network_type),\n
(\'memory_size\', memory_size),\n
(\'memory_type\', memory_type),\n
(\'storage_capacity\', storage_capacity),\n
(\'storage_interface\', storage_interface),\n
(\'storage_redundancy\', storage_redundancy),\n
(\'computer_guid\', computer_guid),\n
]:\n
if sla_category:\n
sla_xml += \'<parameter id="%s">
%s
</parameter>
\' % (sla_category_id, sla_category)\n
\n
if sla_xml:\n
request_kw[\'sla_xml\'] = """
<?xml version=\'1.0\' encoding=\'utf-8\'?>
\n
<instance>
\n
%s\n
</instance>
""" % sla_xml\n
\n
person.requestSoftwareInstance(**request_kw)\n
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>
<value>
<string>
service_title=None, instance_xml=None
</string>
</value>
<value>
<string>
dialog_id, service_title, instance_xml, computer_guid=\'\', cpu_core=\'\', cpu_frequency=\'\', cpu_type=\'\', local_area_network_type=\'\', memory_size=\'\', memory_type=\'\', storage_capacity=\'\', storage_interface=\'\', storage_redundancy=\'\', **kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml
View file @
00954e1f
...
@@ -98,6 +98,16 @@
...
@@ -98,6 +98,16 @@
<string>
your_ad
</string>
<string>
your_ad
</string>
<string>
your_instance_xml
</string>
<string>
your_instance_xml
</string>
<string>
your_description
</string>
<string>
your_description
</string>
<string>
your_computer_guid
</string>
<string>
your_cpu_core
</string>
<string>
your_cpu_frequency
</string>
<string>
your_cpu_type
</string>
<string>
your_local_area_network_type
</string>
<string>
your_memory_size
</string>
<string>
your_memory_type
</string>
<string>
your_storage_capacity
</string>
<string>
your_storage_interface
</string>
<string>
your_storage_redundancy
</string>
<string>
your_monitoring_status
</string>
<string>
your_monitoring_status
</string>
<string>
your_monitoring_status_js
</string>
<string>
your_monitoring_status_js
</string>
</list>
</list>
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_computer_guid.xml
0 → 100644
View file @
00954e1f
This diff is collapsed.
Click to expand it.
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_cpu_core
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
CPU Core
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_cpu_frequency
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
CPU Frequency
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_cpu_type
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
CPU Type
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_local_area_network_type.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_local_area_network_type
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
LAN Type
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_size.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_memory_size
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Memory Size
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_type.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_memory_type
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Memory Type
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml
View file @
00954e1f
...
@@ -215,7 +215,7 @@
...
@@ -215,7 +215,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
css_class
</string>
</key>
<key>
<string>
css_class
</string>
</key>
<value>
<string>
nolabel alignr
</string>
</value>
<value>
<string>
nolabel alignr
error
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
default
</string>
</key>
<key>
<string>
default
</string>
</key>
...
...
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_capacity.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_storage_capacity
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Storage Capacity
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_interface.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_storage_interface
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Storage Interface
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_redundancy.xml
0 → 100644
View file @
00954e1f
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"ProxyField"
module=
"Products.ERP5Form.ProxyField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
delegated_list
</string>
</key>
<value>
<list>
<string>
items
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
your_storage_redundancy
</string>
</value>
</item>
<item>
<key>
<string>
message_values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
external_validator_failed
</string>
</key>
<value>
<string>
The input failed the external validator.
</string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
overrides
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
tales
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_category
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Storage Redundancy
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml
View file @
00954e1f
...
@@ -65,8 +65,10 @@ else:\n
...
@@ -65,8 +65,10 @@ else:\n
if kw.has_key(\'came_from\'):\n
if kw.has_key(\'came_from\'):\n
#we override the context to redirect the user to the next web section\n
#we override the context to redirect the user to the next web section\n
context = portal.restrictedTraverse(kw[\'came_from\'])\n
context = portal.restrictedTraverse(kw[\'came_from\'])\n
\n
\n
context.WebSection_viewNextStep()\n
software_release = portal.portal_catalog.getResultValue(uid=uids[0])\n
return software_release.Base_redirect(\'SoftwareRelease_viewRequestDialog\')\n
# context.WebSection_viewNextStep()\n
</string>
</value>
</string>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/vifib_web/bt/revision
View file @
00954e1f
454
456
\ No newline at end of file
\ No newline at end of file
setup.py
View file @
00954e1f
from
setuptools
import
setup
,
find_packages
from
setuptools
import
setup
,
find_packages
import
glob
import
glob
import
os
import
os
version
=
'0.28.
9
-dev'
version
=
'0.28.
10
-dev'
name
=
'slapos.core'
name
=
'slapos.core'
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
long_description
=
open
(
"README.txt"
).
read
()
+
"
\
n
"
+
\
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
open
(
"CHANGES.txt"
).
read
()
+
"
\
n
"
...
...
slapos/format.py
View file @
00954e1f
...
@@ -472,7 +472,7 @@ class User(object):
...
@@ -472,7 +472,7 @@ class User(object):
try
:
try
:
pwd
.
getpwnam
(
self
.
name
)
pwd
.
getpwnam
(
self
.
name
)
except
KeyError
:
except
KeyError
:
user_parameter_list
.
append
(
'-
-system
'
)
user_parameter_list
.
append
(
'-
r
'
)
callAndRead
([
'useradd'
]
+
user_parameter_list
)
callAndRead
([
'useradd'
]
+
user_parameter_list
)
else
:
else
:
callAndRead
([
'usermod'
]
+
user_parameter_list
)
callAndRead
([
'usermod'
]
+
user_parameter_list
)
...
...
slapos/tests/slapformat.py
View file @
00954e1f
...
@@ -225,7 +225,7 @@ class TestComputer(SlapformatMixin):
...
@@ -225,7 +225,7 @@ class TestComputer(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
'ip addr list bridge'
,
'ip addr list bridge'
,
'groupadd slapsoft'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
-system
'
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
r
'
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
@@ -259,7 +259,7 @@ class TestComputer(SlapformatMixin):
...
@@ -259,7 +259,7 @@ class TestComputer(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
'ip addr list bridge'
,
'ip addr list bridge'
,
'groupadd slapsoft'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
-system
'
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
r
'
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
@@ -309,9 +309,9 @@ class TestComputer(SlapformatMixin):
...
@@ -309,9 +309,9 @@ class TestComputer(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
'ip addr list bridge'
,
'ip addr list bridge'
,
'groupadd slapsoft'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
-system
'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
r
'
,
'groupadd testuser'
,
'groupadd testuser'
,
'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -
-system
'
,
'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -
r
'
,
'tunctl -t tap -u testuser'
,
'tunctl -t tap -u testuser'
,
'ip link set tap up'
,
'ip link set tap up'
,
'brctl show'
,
'brctl show'
,
...
@@ -391,9 +391,9 @@ class TestComputer(SlapformatMixin):
...
@@ -391,9 +391,9 @@ class TestComputer(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
# 'ip addr list bridge',
# 'ip addr list bridge',
'groupadd slapsoft'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
-system
'
,
'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -
r
'
,
'groupadd testuser'
,
'groupadd testuser'
,
'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -
-system
'
,
'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -
r
'
,
# 'ip addr add ip/255.255.255.255 dev bridge',
# 'ip addr add ip/255.255.255.255 dev bridge',
# 'ip addr list bridge',
# 'ip addr list bridge',
# 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge',
# 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge',
...
@@ -469,7 +469,7 @@ class TestUser(SlapformatMixin):
...
@@ -469,7 +469,7 @@ class TestUser(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
'groupadd doesnotexistsyet'
,
'groupadd doesnotexistsyet'
,
'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false '
\
'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false '
\
'doesnotexistsyet -
-system
'
'doesnotexistsyet -
r
'
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
@@ -482,7 +482,7 @@ class TestUser(SlapformatMixin):
...
@@ -482,7 +482,7 @@ class TestUser(SlapformatMixin):
self
.
assertEqual
([
self
.
assertEqual
([
'groupadd doesnotexistsyet'
,
'groupadd doesnotexistsyet'
,
'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false -G '
\
'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false -G '
\
'additionalgroup1,additionalgroup2 doesnotexistsyet -
-system
'
'additionalgroup1,additionalgroup2 doesnotexistsyet -
r
'
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
@@ -494,7 +494,7 @@ class TestUser(SlapformatMixin):
...
@@ -494,7 +494,7 @@ class TestUser(SlapformatMixin):
user
.
create
()
user
.
create
()
self
.
assertEqual
([
self
.
assertEqual
([
'useradd -d /testuser -g testuser -s /bin/false testuser -
-system
'
'useradd -d /testuser -g testuser -s /bin/false testuser -
r
'
],
],
self
.
fakeCallAndRead
.
external_command_list
)
self
.
fakeCallAndRead
.
external_command_list
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment