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
20
Merge Requests
20
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.core
Commits
b69b44f7
Commit
b69b44f7
authored
Jul 29, 2019
by
Julien Muchembled
Committed by
Rafael Monnerat
Aug 01, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapproxy: skip instanciation if nothing has changed
parent
f8ef5700
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
347 additions
and
198 deletions
+347
-198
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+19
-22
slapos/proxy/schema.sql
slapos/proxy/schema.sql
+2
-1
slapos/proxy/views.py
slapos/proxy/views.py
+64
-64
slapos/slap/slap.py
slapos/slap/slap.py
+4
-4
slapos/tests/test_slapproxy.py
slapos/tests/test_slapproxy.py
+52
-26
slapos/tests/test_slapproxy/database_dump_version_13.sql
slapos/tests/test_slapproxy/database_dump_version_13.sql
+124
-0
slapos/tests/test_slapproxy/database_dump_version_current.sql
...os/tests/test_slapproxy/database_dump_version_current.sql
+82
-81
No files found.
slapos/grid/slapgrid.py
View file @
b69b44f7
...
...
@@ -43,6 +43,7 @@ import logging
import
json
import
shutil
import
six
import
errno
if
sys
.
version_info
<
(
2
,
6
):
warnings
.
warn
(
'Used python version (%s) is old and has problems with'
...
...
@@ -966,10 +967,7 @@ stderr_logfile_backups=1
COMPUTER_PARTITION_TIMESTAMP_FILENAME
)
parameter_dict
=
computer_partition
.
getInstanceParameterDict
()
if
'timestamp'
in
parameter_dict
:
timestamp
=
parameter_dict
[
'timestamp'
]
else
:
timestamp
=
None
timestamp
=
parameter_dict
.
get
(
'timestamp'
)
error_output_file
=
os
.
path
.
join
(
instance_path
,
...
...
@@ -1031,18 +1029,23 @@ stderr_logfile_backups=1
# If not: it's not worth processing this partition (nothing has
# changed).
if
(
computer_partition_id
not
in
self
.
computer_partition_filter_list
and
not
self
.
develop
and
os
.
path
.
exists
(
timestamp_path
)):
with
open
(
timestamp_path
)
as
f
:
old_timestamp
=
f
.
read
()
last_runtime
=
int
(
os
.
path
.
getmtime
(
timestamp_path
))
if
timestamp
:
try
:
if
periodicity
==
0
:
os
.
remove
(
timestamp_path
)
elif
int
(
timestamp
)
<=
int
(
old_timestamp
):
not
self
.
develop
and
timestamp
and
periodicity
):
try
:
last_runtime
=
os
.
path
.
getmtime
(
timestamp_path
)
except
OSError
as
e
:
if
e
.
errno
!=
errno
.
ENOENT
:
raise
else
:
with
open
(
timestamp_path
)
as
f
:
try
:
old_timestamp
=
float
(
f
.
read
())
except
ValueError
:
self
.
logger
.
exception
(
''
)
old_timestamp
=
0
if
float
(
timestamp
)
<=
old_timestamp
:
# Check periodicity, i.e if periodicity is one day, partition
# should be processed at least every day.
if
int
(
time
.
time
())
<=
(
last_runtime
+
periodicity
)
or
periodicity
<
0
:
if
time
.
time
()
<=
last_runtime
+
periodicity
or
periodicity
<
0
:
# check promises anomaly
if
computer_partition_state
==
COMPUTER_PARTITION_STARTED_STATE
:
self
.
logger
.
debug
(
'Partition already up-to-date.'
)
...
...
@@ -1055,13 +1058,7 @@ stderr_logfile_backups=1
manager
.
instanceTearDown
(
local_partition
)
return
else
:
# Periodicity forced processing this partition. Removing
# the timestamp file in case it fails.
os
.
remove
(
timestamp_path
)
except
ValueError
:
os
.
remove
(
timestamp_path
)
self
.
logger
.
exception
(
''
)
os
.
remove
(
timestamp_path
)
# Include Partition Logging
log_folder_path
=
"%s/.slapgrid/log"
%
instance_path
...
...
@@ -1168,7 +1165,7 @@ stderr_logfile_backups=1
# If partition has been successfully processed, write timestamp
if
timestamp
:
with
open
(
timestamp_path
,
'w'
)
as
f
:
f
.
write
(
timestamp
)
f
.
write
(
str
(
timestamp
)
)
def
FilterComputerPartitionList
(
self
,
computer_partition_list
):
"""
...
...
slapos/proxy/schema.sql
View file @
b69b44f7
--version:1
3
--version:1
4
CREATE
TABLE
IF
NOT
EXISTS
software
%
(
version
)
s
(
url
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'%(computer)s'
,
...
...
@@ -26,6 +26,7 @@ CREATE TABLE IF NOT EXISTS partition%(version)s (
requested_by
VARCHAR
(
255
),
-- only used for debugging,
-- slapproxy does not support proper scope
requested_state
VARCHAR
(
255
)
NOT
NULL
DEFAULT
'started'
,
timestamp
REAL
,
CONSTRAINT
uniq
PRIMARY
KEY
(
reference
,
computer_reference
)
);
...
...
slapos/proxy/views.py
View file @
b69b44f7
...
...
@@ -31,6 +31,7 @@
from
lxml
import
etree
import
random
import
string
import
time
from
datetime
import
datetime
from
slapos.slap.slap
import
Computer
,
ComputerPartition
,
\
SoftwareRelease
,
SoftwareInstance
,
NotFoundError
...
...
@@ -91,7 +92,8 @@ def partitiondict2partition(partition):
slap_partition
.
_software_release_document
=
None
slap_partition
.
_requested_state
=
'destroyed'
slap_partition
.
_need_modification
=
0
slap_partition
.
_instance_guid
=
'%s-%s'
%
(
partition
[
'computer_reference'
],
partition
[
'reference'
])
slap_partition
.
_instance_guid
=
'%(computer_reference)s-%(reference)s'
\
%
partition
root_partition
=
getRootPartition
(
partition
[
'reference'
])
...
...
@@ -118,6 +120,9 @@ def partitiondict2partition(partition):
loads
(
partition
[
'slave_instance_list'
].
encode
(
'utf-8'
))
else
:
slap_partition
.
_parameter_dict
[
'slave_instance_list'
]
=
[]
timestamp
=
partition
[
'timestamp'
]
if
timestamp
:
slap_partition
.
_parameter_dict
[
'timestamp'
]
=
str
(
timestamp
)
slap_partition
.
_connection_dict
=
xml2dict
(
partition
[
'connection_xml'
])
slap_partition
.
_software_release_document
=
SoftwareRelease
(
software_release
=
partition
[
'software_release'
],
...
...
@@ -267,12 +272,18 @@ def setComputerPartitionConnectionXml():
query
=
'UPDATE %s SET connection_xml=? WHERE reference=? AND computer_reference=?'
argument_list
=
[
connection_xml
,
computer_partition_id
,
computer_id
]
execute_db
(
'partition'
,
query
,
argument_list
)
return
'done'
# Update timestamp of parent partition.
requested_by
=
execute_db
(
'partition'
,
'SELECT requested_by FROM %s WHERE reference=? AND computer_reference=?'
,
(
computer_partition_id
,
computer_id
),
one
=
True
)[
'requested_by'
]
execute_db
(
'partition'
,
"UPDATE %s SET timestamp=? WHERE reference=? AND computer_reference=?"
,
(
time
.
time
(),
requested_by
,
computer_id
))
else
:
query
=
'UPDATE %s SET connection_xml=? , hosted_by=? WHERE reference=?'
argument_list
=
[
connection_xml
,
computer_partition_id
,
slave_reference
]
execute_db
(
'slave'
,
query
,
argument_list
)
return
'done'
return
'done'
@
app
.
route
(
'/buildingSoftwareRelease'
,
methods
=
[
'POST'
])
def
buildingSoftwareRelease
():
...
...
@@ -569,26 +580,23 @@ def getRootPartition(reference):
reference
,
execute_db
(
"partition"
,
"select reference, requested_by from %s"
)))
return
None
parent_partition
=
execute_db
(
'partition'
,
p
,
[
partition
[
'requested_by'
]],
one
=
True
)
while
(
parent_partition
is
not
None
and
parent_partition
[
'requested_by'
]
and
parent_partition
[
'requested_by'
]
!=
reference
):
while
True
:
requested_by
=
partition
[
'requested_by'
]
if
requested_by
is
None
or
requested_by
==
reference
:
return
partition
parent_partition
=
execute_db
(
'partition'
,
p
,
(
requested_by
,),
one
=
True
)
if
parent_partition
is
None
:
return
partition
partition
=
parent_partition
reference
=
parent_partition
[
'requested_by'
]
parent_partition
=
execute_db
(
'partition'
,
p
,
[
reference
],
one
=
True
)
return
partition
reference
=
requested_by
def
requestNotSlave
(
software_release
,
software_type
,
partition_reference
,
partition_id
,
partition_parameter_kw
,
filter_kw
,
requested_state
):
instance_xml
=
dict2xml
(
partition_parameter_kw
)
requested_computer_id
=
filter_kw
[
'computer_guid'
]
args
=
[]
a
=
args
.
append
q
=
'SELECT * FROM %s WHERE partition_reference=?'
a
(
partition_reference
)
partition
=
execute_db
(
'partition'
,
q
,
args
,
one
=
True
)
partition
=
execute_db
(
'partition'
,
'SELECT * FROM %s WHERE partition_reference=?'
,
(
partition_reference
,),
one
=
True
)
args
=
[]
a
=
args
.
append
...
...
@@ -601,8 +609,6 @@ def requestNotSlave(software_release, software_type, partition_reference, partit
if
partition
is
None
:
app
.
logger
.
warning
(
'No more free computer partition'
)
abort
(
404
)
q
+=
' ,software_release=?'
a
(
software_release
)
if
partition_reference
:
q
+=
' ,partition_reference=?'
a
(
partition_reference
)
...
...
@@ -612,10 +618,6 @@ def requestNotSlave(software_release, software_type, partition_reference, partit
if
not
software_type
:
software_type
=
'RootSoftwareInstance'
else
:
# XXX Check if software_release should be updated
if
partition
[
'software_release'
]
!=
software_release
:
q
+=
' ,software_release=?'
a
(
software_release
)
if
partition
[
'requested_by'
]:
root_partition
=
getRootPartition
(
partition
[
'requested_by'
])
if
root_partition
and
root_partition
[
'requested_state'
]
!=
"started"
:
...
...
@@ -623,49 +625,49 @@ def requestNotSlave(software_release, software_type, partition_reference, partit
# child can be stopped or destroyed while parent is started
requested_state
=
root_partition
[
'requested_state'
]
if
requested_state
:
q
+=
', requested_state=?'
a
(
requested_state
)
#
# XXX change software_type when requested
#
if
software_type
:
q
+=
' ,software_type=?'
a
(
software_type
)
timestamp
=
partition
[
'timestamp'
]
changed
=
timestamp
is
None
for
k
,
v
in
((
'requested_state'
,
requested_state
or
partition
[
'requested_state'
]),
(
'software_release'
,
software_release
),
(
'software_type'
,
software_type
),
(
'xml'
,
instance_xml
)):
if
partition
[
k
]
!=
v
:
q
+=
', %s=?'
%
k
a
(
v
)
changed
=
True
if
changed
:
timestamp
=
time
.
time
()
q
+=
', timestamp=?'
a
(
timestamp
)
# Else: only update partition parameters
if
instance_xml
:
q
+=
' ,xml=?'
a
(
instance_xml
)
q
+=
' WHERE reference=? AND computer_reference=?'
a
(
partition
[
'reference'
])
a
(
partition
[
'computer_reference'
])
execute_db
(
'partition'
,
q
,
args
)
args
=
[]
partition
=
execute_db
(
'partition'
,
'SELECT * FROM %s WHERE reference=? and computer_reference=?'
,
[
partition
[
'reference'
],
partition
[
'computer_reference'
]],
one
=
True
)
address_list
=
[]
for
address
in
execute_db
(
'partition_network'
,
'SELECT * FROM %s WHERE partition_reference=?'
,
[
partition
[
'reference'
]]):
address_list
.
append
((
address
[
'reference'
],
address
[
'address'
]))
if
not
requested_state
:
requested_state
=
'started'
# XXX it should be ComputerPartition, not a SoftwareInstance
software_instance
=
SoftwareInstance
(
_connection_dict
=
xml2dict
(
partition
[
'connection_xml'
]),
_parameter_dict
=
xml2dict
(
partition
[
'xml'
]),
connection_xml
=
partition
[
'connection_xml'
],
slap_computer_id
=
partition
[
'computer_reference'
],
slap_computer_partition_id
=
partition
[
'reference'
],
slap_software_release_url
=
partition
[
'software_release'
],
slap_server_url
=
'slap_server_url'
,
slap_software_type
=
partition
[
'software_type'
],
_instance_guid
=
'%s-%s'
%
(
partition
[
'computer_reference'
],
partition
[
'reference'
]),
_requested_state
=
requested_state
,
ip_list
=
address_list
)
return
software_instance
parameter_dict
=
xml2dict
(
partition
[
'xml'
])
parameter_dict
[
'timestamp'
]
=
str
(
partition
[
'timestamp'
])
return
SoftwareInstance
(
_connection_dict
=
xml2dict
(
partition
[
'connection_xml'
]),
_parameter_dict
=
parameter_dict
,
connection_xml
=
partition
[
'connection_xml'
],
slap_computer_id
=
partition
[
'computer_reference'
],
slap_computer_partition_id
=
partition
[
'reference'
],
slap_software_release_url
=
partition
[
'software_release'
],
slap_server_url
=
'slap_server_url'
,
slap_software_type
=
partition
[
'software_type'
],
_instance_guid
=
'%(computer_reference)s-%(reference)s'
%
partition
,
_requested_state
=
requested_state
or
'started'
,
ip_list
=
address_list
)
def
requestSlave
(
software_release
,
software_type
,
partition_reference
,
partition_id
,
partition_parameter_kw
,
filter_kw
,
requested_state
):
"""
...
...
@@ -737,7 +739,6 @@ def requestSlave(software_release, software_type, partition_reference, partition
a
(
partition
[
'reference'
])
a
(
requested_computer_id
)
execute_db
(
'partition'
,
q
,
args
)
args
=
[]
partition
=
execute_db
(
'partition'
,
'SELECT * FROM %s WHERE reference=? and computer_reference=?'
,
[
partition
[
'reference'
],
requested_computer_id
],
one
=
True
)
...
...
@@ -758,16 +759,15 @@ def requestSlave(software_release, software_type, partition_reference, partition
address_list
.
append
((
address
[
'reference'
],
address
[
'address'
]))
# XXX it should be ComputerPartition, not a SoftwareInstance
software_instance
=
SoftwareInstance
(
_connection_dict
=
xml2dict
(
slave
[
'connection_xml'
]),
_parameter_dict
=
xml2dict
(
instance_xml
),
slap_computer_id
=
partition
[
'computer_reference'
],
slap_computer_partition_id
=
slave
[
'hosted_by'
],
slap_software_release_url
=
partition
[
'software_release'
],
slap_server_url
=
'slap_server_url'
,
slap_software_type
=
partition
[
'software_type'
],
ip_list
=
address_list
)
return
software_instance
return
SoftwareInstance
(
_connection_dict
=
xml2dict
(
slave
[
'connection_xml'
]),
_parameter_dict
=
xml2dict
(
instance_xml
),
slap_computer_id
=
partition
[
'computer_reference'
],
slap_computer_partition_id
=
slave
[
'hosted_by'
],
slap_software_release_url
=
partition
[
'software_release'
],
slap_server_url
=
'slap_server_url'
,
slap_software_type
=
partition
[
'software_type'
],
ip_list
=
address_list
)
@
app
.
route
(
'/softwareInstanceRename'
,
methods
=
[
'POST'
])
def
softwareInstanceRename
():
...
...
slapos/slap/slap.py
View file @
b69b44f7
...
...
@@ -627,16 +627,16 @@ class ComputerPartition(SlapRequester):
def
getInstanceParameter
(
self
,
key
):
parameter_dict
=
getattr
(
self
,
'_parameter_dict'
,
None
)
or
{}
if
key
in
parameter_dict
:
try
:
return
parameter_dict
[
key
]
e
lse
:
e
xcept
KeyError
:
raise
NotFoundError
(
"%s not found"
%
key
)
def
getConnectionParameter
(
self
,
key
):
connection_dict
=
self
.
getConnectionParameterDict
()
if
key
in
connection_dict
:
try
:
return
connection_dict
[
key
]
e
lse
:
e
xcept
KeyError
:
raise
NotFoundError
(
"%s not found"
%
key
)
def
setUsage
(
self
,
usage_log
):
...
...
slapos/tests/test_slapproxy.py
View file @
b69b44f7
...
...
@@ -314,12 +314,13 @@ class MasterMixin(BasicMixin, unittest.TestCase):
}
return
self
.
app
.
post
(
'/requestComputerPartition'
,
data
=
request_dict
)
def
request
(
self
,
*
args
,
**
kw
args
):
def
request
(
self
,
*
args
,
**
kw
):
"""
Simulate a request with above parameters
Return response by server (a computer partition or an error)
"""
rv
=
self
.
_requestComputerPartition
(
*
args
,
**
kwargs
)
rv
=
self
.
_requestComputerPartition
(
*
args
,
**
kw
)
requested_at
=
time
.
time
()
self
.
assertEqual
(
rv
.
_status_code
,
200
)
xml
=
rv
.
data
software_instance
=
loads
(
xml
)
...
...
@@ -329,6 +330,11 @@ class MasterMixin(BasicMixin, unittest.TestCase):
software_instance
.
slap_computer_partition_id
)
computer_partition
.
__dict__
.
update
(
software_instance
.
__dict__
)
if
not
kw
.
get
(
'shared'
):
self
.
assertLessEqual
(
float
(
computer_partition
.
_parameter_dict
[
'timestamp'
]),
requested_at
)
return
computer_partition
def
supply
(
self
,
url
,
computer_id
=
None
,
state
=
'available'
):
...
...
@@ -464,9 +470,14 @@ class TestRequest(MasterMixin):
Request will return same partition for two equal requests
"""
self
.
add_free_partition
(
2
)
self
.
assertEqual
(
self
.
request
(
'http://sr//'
,
None
,
'MyFirstInstance'
,
'slappart2'
).
__dict__
,
self
.
request
(
'http://sr//'
,
None
,
'MyFirstInstance'
,
'slappart2'
).
__dict__
)
def
do_request
():
return
self
.
request
(
'http://sr//'
,
None
,
'MyFirstInstance'
,
'slappart2'
)
requested_at
=
time
.
time
()
partition
=
do_request
()
self
.
assertLessEqual
(
float
(
str
(
requested_at
)),
float
(
partition
.
_parameter_dict
[
'timestamp'
]))
time
.
sleep
(.
1
)
# check timestamp does not change for an identical request
self
.
assertEqual
(
partition
.
__dict__
,
do_request
().
__dict__
)
def
test_request_propagate_partition_state
(
self
):
"""
...
...
@@ -521,32 +532,34 @@ class TestRequest(MasterMixin):
request1
=
self
.
request
(
'http://sr//'
,
None
,
'MyFirstInstance'
,
'slappart2'
,
partition_parameter_kw
=
{
'domain'
:
wanted_domain1
})
request1_dict
=
request1
.
__dict__
requested_result1
=
self
.
getPartitionInformation
(
request1_dict
[
'_partition_id'
])
requested_result1
=
self
.
getPartitionInformation
(
request1
.
_partition_id
)
time
.
sleep
(.
1
)
# so that timestamp changes
request2
=
self
.
request
(
'http://sr//'
,
'Papa'
,
'MyFirstInstance'
,
'slappart2'
,
partition_parameter_kw
=
{
'domain'
:
wanted_domain2
})
request2_dict
=
request2
.
__dict__
requested_result2
=
self
.
getPartitionInformation
(
request2_dict
[
'_partition_id'
])
requested_result2
=
self
.
getPartitionInformation
(
request2
.
_partition_id
)
# Test we received same partition
for
key
in
[
'_partition_id'
,
'_computer_id'
]
:
self
.
assertEqual
(
request1_dict
[
key
],
request2_dict
[
key
]
)
for
key
in
'_partition_id'
,
'_computer_id'
:
self
.
assertEqual
(
getattr
(
request1
,
key
),
getattr
(
request2
,
key
)
)
# Test that only parameters changed
for
key
in
requested_result2
.
__dict__
:
if
key
not
in
[
'_parameter_dict'
,
'_software_release_document'
]:
self
.
assertEqual
(
requested_result2
.
__dict__
[
key
],
requested_result1
.
__dict__
[
key
])
elif
key
in
[
'_software_release_document'
]:
self
.
assertEqual
(
requested_result2
.
__dict__
[
key
].
__dict__
,
requested_result1
.
__dict__
[
key
].
__dict__
)
if
key
==
'_software_release_document'
:
self
.
assertEqual
(
getattr
(
requested_result2
,
key
).
__dict__
,
getattr
(
requested_result1
,
key
).
__dict__
)
elif
key
!=
'_parameter_dict'
:
self
.
assertEqual
(
getattr
(
requested_result2
,
key
),
getattr
(
requested_result1
,
key
))
#Test parameters where set correctly
self
.
assertEqual
(
wanted_domain1
,
requested_result1
.
_parameter_dict
[
'domain'
])
self
.
assertEqual
(
wanted_domain2
,
requested_result2
.
_parameter_dict
[
'domain'
])
t1
=
request1
.
_parameter_dict
[
'timestamp'
]
t2
=
request2
.
_parameter_dict
[
'timestamp'
]
self
.
assertLess
(
float
(
t1
),
float
(
t2
))
self
.
assertEqual
(
t1
,
requested_result1
.
_parameter_dict
[
'timestamp'
])
self
.
assertEqual
(
t2
,
requested_result2
.
_parameter_dict
[
'timestamp'
])
def
test_two_requests_with_different_parameters_and_sr_url_but_same_reference
(
self
):
"""
Request will return same partition for two different requests but will
...
...
@@ -1377,7 +1390,7 @@ class _MigrationTestCase(TestInformation, TestRequest, TestSlaveRequest, TestMul
"""
dump_filename
=
NotImplemented
initial_table_list
=
NotImplemented
current_version
=
'1
3
'
current_version
=
'1
4
'
def
setUp
(
self
):
TestInformation
.
setUp
(
self
)
...
...
@@ -1433,10 +1446,18 @@ class _MigrationTestCase(TestInformation, TestRequest, TestSlaveRequest, TestMul
)
partition_list
=
self
.
db
.
execute
(
"select * from partition{}"
.
format
(
self
.
current_version
)).
fetchall
()
self
.
assertEqual
(
partition_list
,
[(
u'slappart0'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="json">{
\
n
"site-id": "erp5"
\
n
}
\
n
}</parameter>
\
n
</instance>
\
n
'
,
None
,
None
,
u'production'
,
u'slapos'
,
None
,
u'started'
),
(
u'slappart1'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">mysql://127.0.0.1:45678/erp5</parameter>
\
n
</instance>
\
n
'
,
None
,
u'mariadb'
,
u'MariaDB DataBase'
,
u'slappart0'
,
u'started'
),
(
u'slappart2'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="cloudooo-json"></parameter>
\
n
</instance>
\
n
'
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">cloudooo://127.0.0.1:23000/</parameter>
\
n
</instance>
\
n
'
,
None
,
u'cloudooo'
,
u'Cloudooo'
,
u'slappart0'
,
u'started'
),
(
u'slappart3'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">memcached://127.0.0.1:11000/</parameter>
\
n
</instance>
\
n
'
,
None
,
u'memcached'
,
u'Memcached'
,
u'slappart0'
,
u'started'
),
(
u'slappart4'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">memcached://127.0.0.1:13301/</parameter>
\
n
</instance>
\
n
'
,
None
,
u'kumofs'
,
u'KumoFS'
,
u'slappart0'
,
u'started'
),
(
u'slappart5'
,
u'computer'
,
u'busy'
,
u'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="kumofs-url">memcached://127.0.0.1:13301/</parameter>
\
n
<parameter id="memcached-url">memcached://127.0.0.1:11000/</parameter>
\
n
<parameter id="cloudooo-url">cloudooo://127.0.0.1:23000/</parameter>
\
n
</instance>
\
n
'
,
u'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">https://[fc00::1]:10001</parameter>
\
n
</instance>
\
n
'
,
None
,
u'tidstorage'
,
u'TidStorage'
,
u'slappart0'
,
u'started'
),
(
u'slappart6'
,
u'computer'
,
u'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
u'started'
),
(
u'slappart7'
,
u'computer'
,
u'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
u'started'
),
(
u'slappart8'
,
u'computer'
,
u'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
u'started'
),
(
u'slappart9'
,
u'computer'
,
u'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
u'started'
)]
)
self
.
assertEqual
(
partition_list
,
[
(
'slappart0'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="json">{
\
n
"site-id": "erp5"
\
n
}
\
n
}</parameter>
\
n
</instance>
\
n
'
,
None
,
None
,
'production'
,
'slapos'
,
None
,
'started'
,
None
),
(
'slappart1'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">mysql://127.0.0.1:45678/erp5</parameter>
\
n
</instance>
\
n
'
,
None
,
'mariadb'
,
'MariaDB DataBase'
,
'slappart0'
,
'started'
,
None
),
(
'slappart2'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="cloudooo-json"></parameter>
\
n
</instance>
\
n
'
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">cloudooo://127.0.0.1:23000/</parameter>
\
n
</instance>
\
n
'
,
None
,
'cloudooo'
,
'Cloudooo'
,
'slappart0'
,
'started'
,
None
),
(
'slappart3'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">memcached://127.0.0.1:11000/</parameter>
\
n
</instance>
\
n
'
,
None
,
'memcached'
,
'Memcached'
,
'slappart0'
,
'started'
,
None
),
(
'slappart4'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
"<?xml version='1.0' encoding='utf-8'?>
\
n
<instance/>
\
n
"
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">memcached://127.0.0.1:13301/</parameter>
\
n
</instance>
\
n
'
,
None
,
'kumofs'
,
'KumoFS'
,
'slappart0'
,
'started'
,
None
),
(
'slappart5'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="kumofs-url">memcached://127.0.0.1:13301/</parameter>
\
n
<parameter id="memcached-url">memcached://127.0.0.1:11000/</parameter>
\
n
<parameter id="cloudooo-url">cloudooo://127.0.0.1:23000/</parameter>
\
n
</instance>
\
n
'
,
'<?xml version=
\
'
1.0
\
'
encoding=
\
'
utf-8
\
'
?>
\
n
<instance>
\
n
<parameter id="url">https://[fc00::1]:10001</parameter>
\
n
</instance>
\
n
'
,
None
,
'tidstorage'
,
'TidStorage'
,
'slappart0'
,
'started'
,
None
),
(
'slappart6'
,
'computer'
,
'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
'started'
,
None
),
(
'slappart7'
,
'computer'
,
'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
'started'
,
None
),
(
'slappart8'
,
'computer'
,
'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
'started'
,
None
),
(
'slappart9'
,
'computer'
,
'free'
,
None
,
None
,
None
,
None
,
None
,
None
,
None
,
'started'
,
None
),
])
slave_list
=
self
.
db
.
execute
(
"select * from slave{}"
.
format
(
self
.
current_version
)).
fetchall
()
self
.
assertEqual
(
...
...
@@ -1498,4 +1519,9 @@ class TestMigrateVersion12ToLatest(_MigrationTestCase):
initial_table_list
=
[
'computer12'
,
'forwarded_partition_request12'
,
'partition12'
,
'partition_network12'
,
'slave12'
,
'software12'
,
]
del
_MigrationTestCase
\ No newline at end of file
class
TestMigrateVersion13ToLatest
(
_MigrationTestCase
):
dump_filename
=
'database_dump_version_13.sql'
initial_table_list
=
[
'computer13'
,
'forwarded_partition_request13'
,
'partition13'
,
'partition_network13'
,
'slave13'
,
'software13'
,
]
del
_MigrationTestCase
slapos/tests/test_slapproxy/database_dump_version_13.sql
0 → 100644
View file @
b69b44f7
PRAGMA
foreign_keys
=
OFF
;
BEGIN
TRANSACTION
;
CREATE
TABLE
software13
(
url
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'computer'
,
requested_state
VARCHAR
(
255
)
DEFAULT
'available'
,
CONSTRAINT
uniq
PRIMARY
KEY
(
url
,
computer_reference
)
);
INSERT
INTO
"software13"
VALUES
(
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'computer'
,
'available'
);
CREATE
TABLE
computer13
(
reference
VARCHAR
(
255
)
DEFAULT
'computer'
,
address
VARCHAR
(
255
),
netmask
VARCHAR
(
255
),
CONSTRAINT
uniq
PRIMARY
KEY
(
reference
)
);
INSERT
INTO
"computer13"
VALUES
(
'computer'
,
'127.0.0.1'
,
'255.255.255.255'
);
CREATE
TABLE
partition13
(
reference
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'computer'
,
slap_state
VARCHAR
(
255
)
DEFAULT
'free'
,
software_release
VARCHAR
(
255
),
xml
TEXT
,
connection_xml
TEXT
,
slave_instance_list
TEXT
,
software_type
VARCHAR
(
255
),
partition_reference
VARCHAR
(
255
),
-- name of the instance
requested_by
VARCHAR
(
255
),
-- only used for debugging,
-- slapproxy does not support proper scope
requested_state
VARCHAR
(
255
)
NOT
NULL
DEFAULT
'started'
,
CONSTRAINT
uniq
PRIMARY
KEY
(
reference
,
computer_reference
)
);
INSERT
INTO
"partition13"
VALUES
(
'slappart0'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="json">{
"site-id": "erp5"
}
}</parameter>
</instance>
'
,
NULL
,
NULL
,
'production'
,
'slapos'
,
NULL
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart1'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance/>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">mysql://127.0.0.1:45678/erp5</parameter>
</instance>
'
,
NULL
,
'mariadb'
,
'MariaDB DataBase'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart2'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="cloudooo-json"></parameter>
</instance>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">cloudooo://127.0.0.1:23000/</parameter>
</instance>
'
,
NULL
,
'cloudooo'
,
'Cloudooo'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart3'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance/>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">memcached://127.0.0.1:11000/</parameter>
</instance>
'
,
NULL
,
'memcached'
,
'Memcached'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart4'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance/>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">memcached://127.0.0.1:13301/</parameter>
</instance>
'
,
NULL
,
'kumofs'
,
'KumoFS'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart5'
,
'computer'
,
'busy'
,
'/srv/slapgrid//srv//runner/project//slapos/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="kumofs-url">memcached://127.0.0.1:13301/</parameter>
<parameter id="memcached-url">memcached://127.0.0.1:11000/</parameter>
<parameter id="cloudooo-url">cloudooo://127.0.0.1:23000/</parameter>
</instance>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">https://[fc00::1]:10001</parameter>
</instance>
'
,
NULL
,
'tidstorage'
,
'TidStorage'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart6'
,
'computer'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart7'
,
'computer'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart8'
,
'computer'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition13"
VALUES
(
'slappart9'
,
'computer'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
CREATE
TABLE
slave13
(
reference
VARCHAR
(
255
),
-- unique slave reference
computer_reference
VARCHAR
(
255
)
DEFAULT
'computer'
,
connection_xml
TEXT
,
hosted_by
VARCHAR
(
255
),
asked_by
VARCHAR
(
255
)
-- only used for debugging,
-- slapproxy does not support proper scope
);
CREATE
TABLE
partition_network13
(
partition_reference
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'computer'
,
reference
VARCHAR
(
255
),
address
VARCHAR
(
255
),
netmask
VARCHAR
(
255
)
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart0'
,
'computer'
,
'slappart0'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart0'
,
'computer'
,
'slappart0'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart1'
,
'computer'
,
'slappart1'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart1'
,
'computer'
,
'slappart1'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart2'
,
'computer'
,
'slappart2'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart2'
,
'computer'
,
'slappart2'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart3'
,
'computer'
,
'slappart3'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart3'
,
'computer'
,
'slappart3'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart4'
,
'computer'
,
'slappart4'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart4'
,
'computer'
,
'slappart4'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart5'
,
'computer'
,
'slappart5'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart5'
,
'computer'
,
'slappart5'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart6'
,
'computer'
,
'slappart6'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart6'
,
'computer'
,
'slappart6'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart7'
,
'computer'
,
'slappart7'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart7'
,
'computer'
,
'slappart7'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart8'
,
'computer'
,
'slappart8'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart8'
,
'computer'
,
'slappart8'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart9'
,
'computer'
,
'slappart9'
,
'127.0.0.1'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network13"
VALUES
(
'slappart9'
,
'computer'
,
'slappart9'
,
'fc00::1'
,
'ffff:ffff:ffff::'
);
CREATE
TABLE
forwarded_partition_request13
(
partition_reference
VARCHAR
(
255
),
-- a.k.a source_instance_id
master_url
VARCHAR
(
255
)
);
COMMIT
;
slapos/tests/test_slapproxy/database_dump_version_current.sql
View file @
b69b44f7
PRAGMA
foreign_keys
=
OFF
;
BEGIN
TRANSACTION
;
CREATE
TABLE
software1
3
(
CREATE
TABLE
software1
4
(
url
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'slaprunner'
,
requested_state
VARCHAR
(
255
)
DEFAULT
'available'
,
CONSTRAINT
uniq
PRIMARY
KEY
(
url
,
computer_reference
)
);
INSERT
INTO
"software1
3
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg'
,
'slaprunner'
,
'available'
);
INSERT
INTO
"software1
3
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg'
,
'slaprunner'
,
'available'
);
INSERT
INTO
"software1
3
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'slaprunner'
,
'available'
);
CREATE
TABLE
computer1
3
(
INSERT
INTO
"software1
4
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg'
,
'slaprunner'
,
'available'
);
INSERT
INTO
"software1
4
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg'
,
'slaprunner'
,
'available'
);
INSERT
INTO
"software1
4
"
VALUES
(
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'slaprunner'
,
'available'
);
CREATE
TABLE
computer1
4
(
reference
VARCHAR
(
255
)
DEFAULT
'slaprunner'
,
address
VARCHAR
(
255
),
netmask
VARCHAR
(
255
),
CONSTRAINT
uniq
PRIMARY
KEY
(
reference
)
);
INSERT
INTO
"computer1
3
"
VALUES
(
'slaprunner'
,
'10.0.30.235'
,
'255.255.255.255'
);
CREATE
TABLE
partition1
3
(
INSERT
INTO
"computer1
4
"
VALUES
(
'slaprunner'
,
'10.0.30.235'
,
'255.255.255.255'
);
CREATE
TABLE
partition1
4
(
reference
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'slaprunner'
,
slap_state
VARCHAR
(
255
)
DEFAULT
'free'
,
...
...
@@ -29,9 +29,10 @@ CREATE TABLE partition13 (
requested_by
VARCHAR
(
255
),
-- only used for debugging,
-- slapproxy does not support proper scope
requested_state
VARCHAR
(
255
)
NOT
NULL
DEFAULT
'started'
,
timestamp
REAL
,
CONSTRAINT
uniq
PRIMARY
KEY
(
reference
,
computer_reference
)
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{
"mariadb": {
...
...
@@ -78,8 +79,8 @@ INSERT INTO "partition13" VALUES('slappart0','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "login-test-runner-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "monitor-setup-url": "https://monitor.app.officejs.com/#page=settings_configurator&url=/public/feeds&username=admin&password=password", "family-login-v6": "https://[::1]:2159", "deadlock-debugger-password": "password", "family-login": "https://10.0.30.235:2159", "inituser-login": "zope", "inituser-password": "password", "family-activities": "https://10.0.30.235:2155", "monitor-base-url": "", "site-id": "erp5", "mariadb-test-database-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "mariadb-database-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "memcached-volatile-url": "memcached://10.0.30.235:2013/", "memcached-persistent-url": "memcached://10.0.30.235:2003/", "caucase-http-url": "http://[::1]:8890", "activities-test-runner-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"], "family-activities-v6": "https://[::1]:2155"}</parameter>
</instance>
'
,
NULL
,
'default'
,
'slaprunner-dev-local-frontend-2'
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'default'
,
'slaprunner-dev-local-frontend-2'
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"use-ipv6": false, "auto-sign-csr-amount": 2, "server-port": 8890, "name": "caucase", "server-https-port": 8891}</parameter>
</instance>
...
...
@@ -87,8 +88,8 @@ INSERT INTO "partition13" VALUES('slappart1','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"http-url": "http://[::1]:8890", "https-url": "https://[::1]:8891", "init-user": "admin"}</parameter>
</instance>
'
,
NULL
,
'caucase'
,
'caucase'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'caucase'
,
'caucase'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2000, "name": "memcached-persistent"}</parameter>
</instance>
...
...
@@ -96,8 +97,8 @@ INSERT INTO "partition13" VALUES('slappart2','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"url": "memcached://10.0.30.235:2003/", "monitor-base-url": ""}</parameter>
</instance>
'
,
NULL
,
'kumofs'
,
'memcached-persistent'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'kumofs'
,
'memcached-persistent'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2010, "name": "memcached-volatile", "ram-storage-size": 64}</parameter>
</instance>
...
...
@@ -105,8 +106,8 @@ INSERT INTO "partition13" VALUES('slappart3','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"url": "memcached://10.0.30.235:2013/", "monitor-base-url": ""}</parameter>
</instance>
'
,
NULL
,
'kumofs'
,
'memcached-volatile'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'kumofs'
,
'memcached-volatile'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"monitor-passwd": "password", "name": "mariadb", "use-ipv6": false, "tcpv4-port": 2099, "test-database-amount": 12, "innodb-log-file-size": 134217728, "slowest-query-threshold": "", "innodb-buffer-pool-size": 1073741824, "max-slowqueries-threshold": 1000}</parameter>
</instance>
...
...
@@ -114,8 +115,8 @@ INSERT INTO "partition13" VALUES('slappart4','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"monitor-base-url": "", "server-id": 3739295806, "database-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "test-database-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"]}</parameter>
</instance>
'
,
NULL
,
'mariadb'
,
'mariadb'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'mariadb'
,
'mariadb'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"use-ipv6": false, "monitor-passwd": "password", "tcpv4-port": 2100, "name": "zodb", "zodb-dict": {"root": {"family": "1"}}}</parameter>
</instance>
...
...
@@ -123,8 +124,8 @@ INSERT INTO "partition13" VALUES('slappart5','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"storage-dict": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "tidstorage-ip": "", "monitor-base-url": "", "tidstorage-port": ""}</parameter>
</instance>
'
,
NULL
,
'zodb-zeo'
,
'zodb'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'zodb-zeo'
,
'zodb'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"zodb-dict": {"root": {"storage-dict": {"cache-size": "20MB"}, "mount-point": "/", "type": "zeo", "cache-size": 50000}}, "site-id": "erp5", "webdav": false, "saucelabs-dict": {}, "tidstorage-port": "", "hosts-dict": {}, "hostalias-dict": {}, "large-file-threshold": "10MB", "bt5-repository-url": "/srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/bt5 /srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/product/ERP5/bootstrap", "test-runner-apache-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"], "timezone": "Asia/Tokyo", "cloudooo-url": "https://cloudooo.erp5.net/", "mysql-test-url-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "inituser-password": "password", "deadlock-debugger-password": "password", "port-base": 2200, "longrequest-logger-interval": -1, "memcached-url": "memcached://10.0.30.235:2013/", "smtp-url": "smtp://127.0.0.2:0/", "test-runner-enabled": true, "kumofs-url": "memcached://10.0.30.235:2003/", "inituser-login": "zope", "thread-amount": 2, "zodb-zeo": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "id-store-interval": null, "caucase-url": "http://[::1]:8890", "test-runner-node-count": 3, "cloudooo-retry-count": "2", "mysql-url-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "wendelin-core-zblk-fmt": "", "timerserver-interval": 1, "monitor-passwd": "password", "name": "activities", "tidstorage-ip": "", "bt5": "erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_run_my_doc", "private-dev-shm": "", "developer-list": ["zope"], "use-ipv6": false, "instance-count": 4, "longrequest-logger-timeout": 1}</parameter>
</instance>
...
...
@@ -132,8 +133,8 @@ INSERT INTO "partition13" VALUES('slappart6','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "monitor-base-url": "", "zope-address-list": [["10.0.30.235:2203", 2, false], ["10.0.30.235:2204", 2, false], ["10.0.30.235:2205", 2, false], ["10.0.30.235:2206", 2, false]]}</parameter>
</instance>
'
,
NULL
,
'zope'
,
'zope-activities'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'zope'
,
'zope-activities'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"zodb-dict": {"root": {"storage-dict": {"cache-size": "20MB"}, "mount-point": "/", "type": "zeo", "cache-size": 50000}}, "site-id": "erp5", "webdav": false, "saucelabs-dict": {}, "tidstorage-port": "", "hosts-dict": {}, "hostalias-dict": {}, "large-file-threshold": "10MB", "bt5-repository-url": "/srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/bt5 /srv/slapgrid/slappart8/srv/runner/software/287375f0cba269902ba1bc50242839d7/parts/erp5/product/ERP5/bootstrap", "test-runner-apache-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "timezone": "Asia/Tokyo", "cloudooo-url": "https://cloudooo.erp5.net/", "mysql-test-url-list": ["mysql://testuser_0:testpassword0@10.0.30.235:2099/erp5_test_0", "mysql://testuser_1:testpassword1@10.0.30.235:2099/erp5_test_1", "mysql://testuser_2:testpassword2@10.0.30.235:2099/erp5_test_2", "mysql://testuser_3:testpassword3@10.0.30.235:2099/erp5_test_3", "mysql://testuser_4:testpassword4@10.0.30.235:2099/erp5_test_4", "mysql://testuser_5:testpassword5@10.0.30.235:2099/erp5_test_5", "mysql://testuser_6:testpassword6@10.0.30.235:2099/erp5_test_6", "mysql://testuser_7:testpassword7@10.0.30.235:2099/erp5_test_7", "mysql://testuser_8:testpassword8@10.0.30.235:2099/erp5_test_8", "mysql://testuser_9:testpassword9@10.0.30.235:2099/erp5_test_9", "mysql://testuser_10:testpassword10@10.0.30.235:2099/erp5_test_10", "mysql://testuser_11:testpassword11@10.0.30.235:2099/erp5_test_11"], "inituser-password": "password", "deadlock-debugger-password": "password", "port-base": 2200, "longrequest-logger-interval": -1, "memcached-url": "memcached://10.0.30.235:2013/", "smtp-url": "smtp://127.0.0.2:0/", "test-runner-enabled": true, "kumofs-url": "memcached://10.0.30.235:2003/", "inituser-login": "zope", "thread-amount": 10, "zodb-zeo": {"root": {"storage": "root", "server": "10.0.30.235:2100"}}, "id-store-interval": null, "caucase-url": "http://[::1]:8890", "test-runner-node-count": 3, "cloudooo-retry-count": "2", "mysql-url-list": ["mysql://user:insecure@10.0.30.235:2099/erp5"], "wendelin-core-zblk-fmt": "", "timerserver-interval": 1, "monitor-passwd": "password", "name": "backend", "tidstorage-ip": "", "bt5": "erp5_full_text_myisam_catalog erp5_configurator_standard erp5_configurator_maxma_demo erp5_configurator_run_my_doc", "private-dev-shm": "", "developer-list": ["zope"], "use-ipv6": false, "instance-count": 2, "longrequest-logger-timeout": 1}</parameter>
</instance>
...
...
@@ -141,8 +142,8 @@ INSERT INTO "partition13" VALUES('slappart7','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"hosts-dict": {"erp5-cloudooo": "cloudooo.erp5.net", "erp5-smtp": "127.0.0.2", "erp5-catalog-0": "10.0.30.235", "erp5-memcached-volatile": "10.0.30.235", "erp5-memcached-persistent": "10.0.30.235"}, "test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "monitor-base-url": "", "zope-address-list": [["10.0.30.235:2203", 10, false], ["10.0.30.235:2204", 10, false]]}</parameter>
</instance>
'
,
NULL
,
'zope'
,
'zope-backend'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'zope'
,
'zope-backend'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/erp5/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">{"haproxy-server-check-path": "/", "apachedex-configuration": "--erp5-base +erp5 .*/VirtualHostRoot/erp5(/|
\\
?|$) --base +other / --skip-user-agent Zabbix --error-detail --js-embed --quiet", "backend-path-dict": {"activities": "/", "login": "/"}, "name": "balancer", "zope-family-entry-request-zope-activities-test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "crl-update-periodicity": "daily", "ssl-authentication-dict": {"activities": false, "login": false}, "zope-family-entry-request-zope-activities": [["10.0.30.235:2203", 2, false], ["10.0.30.235:2204", 2, false], ["10.0.30.235:2205", 2, false], ["10.0.30.235:2206", 2, false]], "zope-family-entry-request-zope-backend": [["10.0.30.235:2203", 10, false], ["10.0.30.235:2204", 10, false]], "zope-family-dict": {"activities": ["zope-family-entry-request-zope-activities"], "login": ["zope-family-entry-request-zope-backend"]}, "zope-family-entry-request-zope-backend-test-runner-address-list": [["10.0.30.235", 2200], ["10.0.30.235", 2201], ["10.0.30.235", 2202]], "ssl": {}, "caucase-url": "http://[::1]:8890", "monitor-passwd": "password", "use-ipv6": false, "apachedex-promise-threshold": 70, "tcpv4-port": 2150}</parameter>
</instance>
...
...
@@ -150,31 +151,31 @@ INSERT INTO "partition13" VALUES('slappart8','slaprunner','busy','/srv/slapgrid/
<instance>
<parameter id="_">{"activities": "https://10.0.30.235:2155", "login-test-runner-url-list": ["https://10.0.30.235:2157/unit_test_0/", "https://10.0.30.235:2157/unit_test_1/", "https://10.0.30.235:2157/unit_test_2/"], "monitor-base-url": "", "login-v6": "https://[::1]:2159", "activities-v6": "https://[::1]:2155", "login": "https://10.0.30.235:2159", "activities-test-runner-url-list": ["https://10.0.30.235:2153/unit_test_0/", "https://10.0.30.235:2153/unit_test_1/", "https://10.0.30.235:2153/unit_test_2/"]}</parameter>
</instance>
'
,
NULL
,
'balancer'
,
'balancer'
,
'slappart0'
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'balancer'
,
'balancer'
,
'slappart0'
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/seleniumrunner/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance/>
'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="url">http://10.0.30.235:4444/wd/hub</parameter>
<parameter id="display">:123</parameter>
</instance>
'
,
NULL
,
'RootSoftwareInstance'
,
'seleniumrunner'
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
'
,
NULL
,
'RootSoftwareInstance'
,
'seleniumrunner'
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'busy'
,
'/srv/slapgrid/slappart8/srv/runner/project/slapos/software/evil/software.cfg'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance/>'
,
'<?xml version=
''
1.0
''
encoding=
''
utf-8
''
?>
<instance>
<parameter id="_">Ahah this is not json 😜 </parameter>
</instance>
'
,
NULL
,
'RootSoftwareInstance'
,
'evil-instance-with-_-not-json'
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart11'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart12'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart13'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart14'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart15'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart16'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart17'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart18'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
INSERT
INTO
"partition1
3"
VALUES
(
'slappart19'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
);
CREATE
TABLE
slave1
3
(
'
,
NULL
,
'RootSoftwareInstance'
,
'evil-instance-with-_-not-json'
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart11'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart12'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart13'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart14'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart15'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart16'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart17'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart18'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
INSERT
INTO
"partition1
4"
VALUES
(
'slappart19'
,
'slaprunner'
,
'free'
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
'started'
,
NULL
);
CREATE
TABLE
slave1
4
(
reference
VARCHAR
(
255
),
-- unique slave reference
computer_reference
VARCHAR
(
255
)
DEFAULT
'slaprunner'
,
connection_xml
TEXT
,
...
...
@@ -182,54 +183,54 @@ CREATE TABLE slave13 (
asked_by
VARCHAR
(
255
)
-- only used for debugging,
-- slapproxy does not support proper scope
);
CREATE
TABLE
partition_network1
3
(
CREATE
TABLE
partition_network1
4
(
partition_reference
VARCHAR
(
255
),
computer_reference
VARCHAR
(
255
)
DEFAULT
'slaprunner'
,
reference
VARCHAR
(
255
),
address
VARCHAR
(
255
),
netmask
VARCHAR
(
255
)
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'slappart0'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'slappart0'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'slappart1'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'slappart1'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'slappart2'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'slappart2'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'slappart3'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'slappart3'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'slappart4'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'slappart4'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'slappart5'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'slappart5'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'slappart6'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'slappart6'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'slappart7'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'slappart7'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'slappart8'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'slappart8'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'slappart9'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'slappart9'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'slappart10'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'slappart10'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart11'
,
'slaprunner'
,
'slappart11'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart11'
,
'slaprunner'
,
'slappart11'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart12'
,
'slaprunner'
,
'slappart12'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart12'
,
'slaprunner'
,
'slappart12'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart13'
,
'slaprunner'
,
'slappart13'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart13'
,
'slaprunner'
,
'slappart13'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart14'
,
'slaprunner'
,
'slappart14'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart14'
,
'slaprunner'
,
'slappart14'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart15'
,
'slaprunner'
,
'slappart15'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart15'
,
'slaprunner'
,
'slappart15'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart16'
,
'slaprunner'
,
'slappart16'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart16'
,
'slaprunner'
,
'slappart16'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart17'
,
'slaprunner'
,
'slappart17'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart17'
,
'slaprunner'
,
'slappart17'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart18'
,
'slaprunner'
,
'slappart18'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart18'
,
'slaprunner'
,
'slappart18'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart19'
,
'slaprunner'
,
'slappart19'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
3
"
VALUES
(
'slappart19'
,
'slaprunner'
,
'slappart19'
,
'::1'
,
'ffff:ffff:ffff::'
);
CREATE
TABLE
forwarded_partition_request1
3
(
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'slappart0'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart0'
,
'slaprunner'
,
'slappart0'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'slappart1'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart1'
,
'slaprunner'
,
'slappart1'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'slappart2'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart2'
,
'slaprunner'
,
'slappart2'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'slappart3'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart3'
,
'slaprunner'
,
'slappart3'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'slappart4'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart4'
,
'slaprunner'
,
'slappart4'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'slappart5'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart5'
,
'slaprunner'
,
'slappart5'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'slappart6'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart6'
,
'slaprunner'
,
'slappart6'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'slappart7'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart7'
,
'slaprunner'
,
'slappart7'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'slappart8'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart8'
,
'slaprunner'
,
'slappart8'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'slappart9'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart9'
,
'slaprunner'
,
'slappart9'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'slappart10'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart10'
,
'slaprunner'
,
'slappart10'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart11'
,
'slaprunner'
,
'slappart11'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart11'
,
'slaprunner'
,
'slappart11'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart12'
,
'slaprunner'
,
'slappart12'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart12'
,
'slaprunner'
,
'slappart12'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart13'
,
'slaprunner'
,
'slappart13'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart13'
,
'slaprunner'
,
'slappart13'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart14'
,
'slaprunner'
,
'slappart14'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart14'
,
'slaprunner'
,
'slappart14'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart15'
,
'slaprunner'
,
'slappart15'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart15'
,
'slaprunner'
,
'slappart15'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart16'
,
'slaprunner'
,
'slappart16'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart16'
,
'slaprunner'
,
'slappart16'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart17'
,
'slaprunner'
,
'slappart17'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart17'
,
'slaprunner'
,
'slappart17'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart18'
,
'slaprunner'
,
'slappart18'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart18'
,
'slaprunner'
,
'slappart18'
,
'::1'
,
'ffff:ffff:ffff::'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart19'
,
'slaprunner'
,
'slappart19'
,
'10.0.30.235'
,
'255.255.255.255'
);
INSERT
INTO
"partition_network1
4
"
VALUES
(
'slappart19'
,
'slaprunner'
,
'slappart19'
,
'::1'
,
'ffff:ffff:ffff::'
);
CREATE
TABLE
forwarded_partition_request1
4
(
partition_reference
VARCHAR
(
255
),
-- a.k.a source_instance_id
master_url
VARCHAR
(
255
)
);
...
...
Jérome Perrin
@jerome
mentioned in merge request
!151 (merged)
·
Nov 01, 2019
mentioned in merge request
!151 (merged)
mentioned in merge request !151
Toggle commit 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