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
Arnaud Véron
slapos.core
Commits
5cd5fd9a
Commit
5cd5fd9a
authored
Jan 26, 2023
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio_api_style: Move to JIO API Revision depending on jio web section
parent
6d66eff8
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
69 additions
and
77 deletions
+69
-77
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchComputeNode.py
...l_skins/slapos_jio_api/jIOWebSection_searchComputeNode.py
+4
-0
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
...rtal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
+5
-0
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
...lapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
+4
-0
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.sql
...i_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.sql
+5
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.xml
...i_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.xml
+21
-3
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.py
..._api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.py
+2
-1
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.xml
...api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.xml
+1
-1
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.sql
...se_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.sql
+4
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.xml
...se_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.xml
+20
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/ComputeNode_calculatejIOAPIRevisionHash.xml
...jio_api_cache/ComputeNode_calculatejIOAPIRevisionHash.xml
+1
-1
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.py
...io_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.py
+0
-1
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.xml
...o_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.xml
+0
-62
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SoftwareInstallation_calculatejIOAPIRevisionHash.xml
...ache/SoftwareInstallation_calculatejIOAPIRevisionHash.xml
+1
-1
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SoftwareInstance_calculatejIOAPIRevisionHash.xml
...pi_cache/SoftwareInstance_calculatejIOAPIRevisionHash.xml
+1
-1
No files found.
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchComputeNode.py
View file @
5cd5fd9a
# Hardcoded
# Hardcoded
limit
=
1000
limit
=
1000
web_section
=
context
.
getWebSectionValue
()
web_section
=
web_section
.
getRelativeUrl
()
if
web_section
else
context
.
REQUEST
.
get
(
"web_section_relative_url"
,
None
)
search_kw
=
{
search_kw
=
{
"portal_type"
:
"Compute Node"
,
"portal_type"
:
"Compute Node"
,
"validation_state"
:
"validated"
,
"validation_state"
:
"validated"
,
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"jio_api_revision.revision"
),
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"jio_api_revision.revision"
),
"jio_api_revision.web_section"
:
web_section
,
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"limit"
:
limit
,
"limit"
:
limit
,
}
}
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
View file @
5cd5fd9a
...
@@ -4,6 +4,9 @@ portal = context.getPortalObject()
...
@@ -4,6 +4,9 @@ portal = context.getPortalObject()
# Hardcoded
# Hardcoded
limit
=
1000
limit
=
1000
web_section
=
context
.
getWebSectionValue
()
web_section
=
web_section
.
getRelativeUrl
()
if
web_section
else
context
.
REQUEST
.
get
(
"web_section_relative_url"
,
None
)
reverse_slap_state_dict
=
{
reverse_slap_state_dict
=
{
"stopped"
:
"stop_requested"
,
"stopped"
:
"stop_requested"
,
"started"
:
"start_requested"
,
"started"
:
"start_requested"
,
...
@@ -20,6 +23,7 @@ if portal_type == "Software Instance":
...
@@ -20,6 +23,7 @@ if portal_type == "Software Instance":
search_kw
=
{
search_kw
=
{
"portal_type"
:
"Software Instance"
,
"portal_type"
:
"Software Instance"
,
"validation_state"
:
"validated"
,
"validation_state"
:
"validated"
,
"jio_api_revision.web_section"
:
web_section
,
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"slap_state"
,
"aggregate_reference"
,
"url_string"
,
"jio_api_revision.revision"
),
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"slap_state"
,
"aggregate_reference"
,
"url_string"
,
"jio_api_revision.revision"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"limit"
:
limit
"limit"
:
limit
...
@@ -55,6 +59,7 @@ elif portal_type == "Shared Instance":
...
@@ -55,6 +59,7 @@ elif portal_type == "Shared Instance":
search_kw
=
{
search_kw
=
{
"portal_type"
:
"Slave Instance"
,
"portal_type"
:
"Slave Instance"
,
"validation_state"
:
"validated"
,
"validation_state"
:
"validated"
,
"jio_api_revision.web_section"
:
web_section
,
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"slap_state"
,
"aggregate_reference"
,
"jio_api_revision.revision"
),
"select_list"
:
(
"title"
,
"reference"
,
"portal_type"
,
"slap_state"
,
"aggregate_reference"
,
"jio_api_revision.revision"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"limit"
:
limit
"limit"
:
limit
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchSoftwareInstallation.py
View file @
5cd5fd9a
# Hardcoded
# Hardcoded
limit
=
1000
limit
=
1000
web_section
=
context
.
getWebSectionValue
()
web_section
=
web_section
.
getRelativeUrl
()
if
web_section
else
context
.
REQUEST
.
get
(
"web_section_relative_url"
,
None
)
search_kw
=
{
search_kw
=
{
"portal_type"
:
"Software Installation"
,
"portal_type"
:
"Software Installation"
,
"validation_state"
:
"validated"
,
"validation_state"
:
"validated"
,
"jio_api_revision.web_section"
:
web_section
,
"select_list"
:
(
"aggregate_reference"
,
"url_string"
,
"slap_state"
,
"portal_type"
,
"slap_date"
,
"jio_api_revision.revision"
),
"select_list"
:
(
"aggregate_reference"
,
"url_string"
,
"slap_state"
,
"portal_type"
,
"slap_date"
,
"jio_api_revision.revision"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"sort_on"
:
(
"jio_api_revision.revision"
,
"ASC"
),
"limit"
:
limit
,
"limit"
:
limit
,
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.sql
View file @
5cd5fd9a
select
select
catalog
.
uid
,
catalog
.
uid
,
catalog
.
relative_url
catalog
.
relative_url
,
catalog
.
portal_type
from
from
catalog
catalog
left
outer
join
left
outer
join
...
@@ -8,7 +9,9 @@ left outer join
...
@@ -8,7 +9,9 @@ left outer join
join
join
slapos_item
on
catalog
.
uid
=
slapos_item
.
uid
slapos_item
on
catalog
.
uid
=
slapos_item
.
uid
where
where
jio_api_revision
.
uid
IS
NULL
(
jio_api_revision
.
uid
IS
NULL
OR
jio_api_revision
.
web_section
!=<
dtml
-
sqlvar
expr
=
"web_section"
type
=
"string"
optional
>
)
AND
(
catalog
.
portal_type
=
"Slave Instance"
OR
catalog
.
portal_type
=
"Software Instance"
)
AND
(
catalog
.
portal_type
=
"Slave Instance"
OR
catalog
.
portal_type
=
"Software Instance"
)
AND
slapos_item
.
slap_state
!=
"draft"
AND
slapos_item
.
slap_state
!=
"draft"
AND
catalog
.
validation_state
=
"validated"
AND
catalog
.
validation_state
=
"validated"
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionInstanceList.xml
View file @
5cd5fd9a
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
width
</string>
</key>
<key>
<string>
width
</string>
</key>
<value>
<int>
6
</int>
</value>
<value>
<int>
0
</int>
</value>
</item>
</item>
</dictionary>
</dictionary>
<dictionary>
<dictionary>
...
@@ -43,7 +43,25 @@
...
@@ -43,7 +43,25 @@
</item>
</item>
<item>
<item>
<key>
<string>
width
</string>
</key>
<key>
<string>
width
</string>
</key>
<value>
<int>
42
</int>
</value>
<value>
<int>
0
</int>
</value>
</item>
</dictionary>
<dictionary>
<item>
<key>
<string>
name
</string>
</key>
<value>
<string>
portal_type
</string>
</value>
</item>
<item>
<key>
<string>
null
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
t
</string>
</value>
</item>
<item>
<key>
<string>
width
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
...
@@ -51,7 +69,7 @@
...
@@ -51,7 +69,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
arguments_src
</string>
</key>
<key>
<string>
arguments_src
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
web_section
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
connection_id
</string>
</key>
<key>
<string>
connection_id
</string>
</key>
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.py
View file @
5cd5fd9a
return
list
(
context
.
Base_zSelectMissingJIOAPIRevisionInstanceList
())
+
list
(
context
.
Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList
())
return
list
(
context
.
Base_zSelectMissingJIOAPIRevisionInstanceList
(
web_section
=
web_section
))
\
+
list
(
context
.
Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList
(
web_section
=
web_section
))
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionObjectList.xml
View file @
5cd5fd9a
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
web_section
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.sql
View file @
5cd5fd9a
select
select
catalog
.
uid
,
catalog
.
uid
,
catalog
.
relative_url
catalog
.
relative_url
,
catalog
.
portal_type
from
from
catalog
catalog
left
outer
join
left
outer
join
jio_api_revision
on
catalog
.
uid
=
jio_api_revision
.
uid
jio_api_revision
on
catalog
.
uid
=
jio_api_revision
.
uid
where
where
jio_api_revision
.
uid
IS
NULL
(
jio_api_revision
.
uid
IS
NULL
OR
jio_api_revision
.
web_section
!=<
dtml
-
sqlvar
expr
=
"web_section"
type
=
"string"
>
)
AND
(
catalog
.
portal_type
=
"Compute Node"
OR
catalog
.
portal_type
=
"Software Installation"
)
AND
(
catalog
.
portal_type
=
"Compute Node"
OR
catalog
.
portal_type
=
"Software Installation"
)
AND
catalog
.
validation_state
=
"validated"
AND
catalog
.
validation_state
=
"validated"
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/Base_zSelectMissingJIOAPIRevisionSoftwareAndComputeList.xml
View file @
5cd5fd9a
...
@@ -43,7 +43,25 @@
...
@@ -43,7 +43,25 @@
</item>
</item>
<item>
<item>
<key>
<string>
width
</string>
</key>
<key>
<string>
width
</string>
</key>
<value>
<int>
42
</int>
</value>
<value>
<int>
43
</int>
</value>
</item>
</dictionary>
<dictionary>
<item>
<key>
<string>
name
</string>
</key>
<value>
<string>
portal_type
</string>
</value>
</item>
<item>
<key>
<string>
null
</string>
</key>
<value>
<int>
1
</int>
</value>
</item>
<item>
<key>
<string>
type
</string>
</key>
<value>
<string>
t
</string>
</value>
</item>
<item>
<key>
<string>
width
</string>
</key>
<value>
<int>
21
</int>
</value>
</item>
</item>
</dictionary>
</dictionary>
</list>
</list>
...
@@ -51,7 +69,7 @@
...
@@ -51,7 +69,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
arguments_src
</string>
</key>
<key>
<string>
arguments_src
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
web_section
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
connection_id
</string>
</key>
<key>
<string>
connection_id
</string>
</key>
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/ComputeNode_calculatejIOAPIRevisionHash.xml
View file @
5cd5fd9a
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.py
deleted
100644 → 0
View file @
6d66eff8
return
context
.
SoftwareInstance_calculatejIOAPIRevisionHash
()
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SlaveInstance_calculatejIOAPIRevisionHash.xml
deleted
100644 → 0
View file @
6d66eff8
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"PythonScript"
module=
"Products.PythonScripts.PythonScript"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<int>
3
</int>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
SlaveInstance_calculatejIOAPIRevisionHash
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SoftwareInstallation_calculatejIOAPIRevisionHash.xml
View file @
5cd5fd9a
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api_cache/SoftwareInstance_calculatejIOAPIRevisionHash.xml
View file @
5cd5fd9a
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
**kw
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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