Skip to content

S
slapos.core
Commit 3e5c2ea7 authored by Gabriel Monnerat's avatar Gabriel Monnerat
Browse files
Options

merged with master

parent 36524879
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 704 additions and 179 deletions
CHANGES.txt
View file @ 3e5c2ea7
0.4 (unreleased) 0.9 (not yet released)
================
* slapformat: Fix issue of bridge not connected with real interface on
Linux >= 2.6.39 [Arnaud Fontaine]
* slapconsole: Simplify usage and use configuration file. You can now
just run slapconsole and type things like "request(kvm, 'mykvm')".
[Cedric de Saint Martin]
0.8 (2011-06-27)
================
* slapgrid: Bugfix for temporary extends cache permissions. [Łukasz Nowak]
0.7 (2011-06-27)
================
* slapgrid: Fallback to buildout in own search path. [Łukasz Nowak]
0.6 (2011-06-27)
================
* slap: Fix bug: state shall be XML encapsulated. [Łukasz Nowak]
0.5 (2011-06-24)
================
* slapgrid: Use temporary extends-cache directory in order to make faster
remote profile refresh. [Łukasz Nowak]
0.4 (2011-06-24)
================ ================
* general: Polish requirement versions. [Arnaud Fontaine] * general: Polish requirement versions. [Arnaud Fontaine]
......
buildout.cfg
View file @ 3e5c2ea7
...@@ -9,6 +9,11 @@ find-links = ...@@ -9,6 +9,11 @@ find-links =
versions = versions versions = versions
# Separate development profile from system python packages
include-site-packages = false
exec-sitecustomize = false
allowed-eggs-from-site-packages =
[pyflakes] [pyflakes]
recipe = zc.recipe.egg recipe = zc.recipe.egg
scripts = scripts =
...@@ -20,6 +25,7 @@ eggs = ...@@ -20,6 +25,7 @@ eggs =
[slapos] [slapos]
recipe = z3c.recipe.scripts recipe = z3c.recipe.scripts
eggs = eggs =
slapos.libnetworkcache
zc.buildout zc.buildout
slapos.core slapos.core
ipython ipython
...@@ -30,4 +36,4 @@ eggs = ...@@ -30,4 +36,4 @@ eggs =
interpreter = python interpreter = python
[versions] [versions]
zc.buildout = 1.5.3-dev-SlapOS-001 zc.buildout = 1.5.3-dev-SlapOS-004
master/bt5/vifib_base/bt/dependency_list
View file @ 3e5c2ea7
erp5_software_pdm erp5_computer_immobilisation
erp5_computer_immobilisation erp5_software_pdm
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_hosting_contract.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_hosting_contract.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_accept.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_accept.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_confirm.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_confirm.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_refuse_isp.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_refuse_isp.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_sendnewcontrat.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_sendnewcontrat.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PathTemplateItem/notification_message_module/vifib_fiber_request_start.xml → master/bt5/vifib_data/PathTemplateItem/notification_message_module/vifib_fiber_request_start.xml
View file @ 3e5c2ea7
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
<key> <string>_Add_portal_content_Permission</string> </key> <key> <string>_Add_portal_content_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -33,10 +30,7 @@ ...@@ -33,10 +30,7 @@
<key> <string>_Delete_objects_Permission</string> </key> <key> <string>_Delete_objects_Permission</string> </key>
<value> <value>
<tuple> <tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,7 +41,6 @@ ...@@ -47,7 +41,6 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -58,8 +51,8 @@ ...@@ -58,8 +51,8 @@
<string>Assignee</string> <string>Assignee</string>
<string>Assignor</string> <string>Assignor</string>
<string>Associate</string> <string>Associate</string>
<string>Auditor</string>
<string>Manager</string> <string>Manager</string>
<string>Owner</string>
</tuple> </tuple>
</value> </value>
</item> </item>
......
master/bt5/vifib_datas/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml → master/bt5/vifib_data/PreferenceTemplateItem/portal_preferences/vifib_default_system_preference.xml
View file @ 3e5c2ea7
...@@ -24,6 +24,22 @@ ...@@ -24,6 +24,22 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>_Modify_portal_content_Permission</string> </key> <key> <string>_Modify_portal_content_Permission</string> </key>
<value> <value>
...@@ -65,6 +81,14 @@ ...@@ -65,6 +81,14 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>System Preference</string> </value> <value> <string>System Preference</string> </value>
</item> </item>
<item>
<key> <string>preferred_credential_recovery_automatic_approval</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>preferred_credential_request_automatic_approval</string> </key>
<value> <int>1</int> </value>
</item>
<item> <item>
<key> <string>preferred_hide_rows_on_no_search_criterion</string> </key> <key> <string>preferred_hide_rows_on_no_search_criterion</string> </key>
<value> <int>1</int> </value> <value> <int>1</int> </value>
...@@ -83,16 +107,24 @@ ...@@ -83,16 +107,24 @@
</item> </item>
<item> <item>
<key> <string>preferred_ooodoc_server_address</string> </key> <key> <string>preferred_ooodoc_server_address</string> </key>
<value> <string>127.0.0.1</string> </value> <value> <string>10.0.0.1</string> </value>
</item> </item>
<item> <item>
<key> <string>preferred_ooodoc_server_port_number</string> </key> <key> <string>preferred_ooodoc_server_port_number</string> </key>
<value> <int>40001</int> </value> <value> <int>23000</int> </value>
</item> </item>
<item> <item>
<key> <string>preferred_software_setup_resource</string> </key> <key> <string>preferred_software_setup_resource</string> </key>
<value> <string>service_module/vifib_software_setup</string> </value> <value> <string>service_module/vifib_software_setup</string> </value>
</item> </item>
<item>
<key> <string>preferred_subscription_assignment_category</string> </key>
<value>
<tuple>
<string>function/customer</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>preferred_time_zone</string> </key> <key> <string>preferred_time_zone</string> </key>
<value> <string>Europe/Paris</string> </value> <value> <string>Europe/Paris</string> </value>
......
master/bt5/vifib_data/bt/description 0 → 100644
View file @ 3e5c2ea7
Contains uncategorised data.
\ No newline at end of file
master/bt5/vifib_data/bt/revision 0 → 100644
View file @ 3e5c2ea7
77
\ No newline at end of file
master/bt5/vifib_data/bt/template_path_list 0 → 100644
View file @ 3e5c2ea7
currency_module/EUR
document_module/1
notification_message_module/vifib*
service_module/vifib_instance_cleanup
service_module/vifib_instance_hosting
service_module/vifib_instance_setup
service_module/vifib_software_setup
service_module/vifib_usage_report
\ No newline at end of file
master/bt5/vifib_data/bt/title 0 → 100644
View file @ 3e5c2ea7
vifib_data
\ No newline at end of file
master/bt5/vifib_data_category/bt/copyright_list 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/dependency_list 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/description 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/license 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/publication_url 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/revision 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/template_format_version 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/title 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_category/bt/version 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/copyright_list 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/dependency_list 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/description 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/license 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/publication_url 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/revision 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/template_format_version 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/template_path_list 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/title 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_data_web/bt/version 0 → 100644
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_datas/bt/comment deleted 100644 → 0
View file @ 36524879
This diff is collapsed.
master/bt5/vifib_datas/bt/description deleted 100644 → 0
View file @ 36524879
This diff is collapsed.
master/bt5/vifib_datas/bt/revision deleted 100644 → 0
View file @ 36524879
This diff is collapsed.
master/bt5/vifib_datas/bt/title deleted 100644 → 0
View file @ 36524879
This diff is collapsed.
master/bt5/vifib_erp5/bt/revision
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_slap/bt/revision
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_upgrader/bt/revision
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_web/bt/dependency_list
View file @ 3e5c2ea7
This diff is collapsed.
master/bt5/vifib_web/bt/revision
View file @ 3e5c2ea7
This diff is collapsed.
master/product/Vifib/tests/VifibMixin.py
View file @ 3e5c2ea7
This diff is collapsed.
setup.py
View file @ 3e5c2ea7
This diff is collapsed.
slapos.cfg.example
View file @ 3e5c2ea7
This diff is collapsed.
slapos/console.py
View file @ 3e5c2ea7
This diff is collapsed.
slapos/format/__init__.py
View file @ 3e5c2ea7
This diff is collapsed.
slapos/grid/SlapObject.py
View file @ 3e5c2ea7
This diff is collapsed.
slapos/grid/utils.py
View file @ 3e5c2ea7
This diff is collapsed.
slapos/slap/slap.py
View file @ 3e5c2ea7
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7