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
Paul Graydon
slapos.core
Commits
84ff7a8c
Commit
84ff7a8c
authored
Jan 29, 2020
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos/collect: Don't invoke create database by default
parent
67ceb724
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
15 deletions
+30
-15
slapos/collect/__init__.py
slapos/collect/__init__.py
+1
-1
slapos/collect/db.py
slapos/collect/db.py
+1
-1
slapos/tests/test_collect.py
slapos/tests/test_collect.py
+28
-13
No files found.
slapos/collect/__init__.py
View file @
84ff7a8c
...
@@ -108,7 +108,7 @@ def do_collect(conf):
...
@@ -108,7 +108,7 @@ def do_collect(conf):
if
stat
.
S_IMODE
(
os
.
stat
(
log_directory
).
st_mode
)
!=
0o755
:
if
stat
.
S_IMODE
(
os
.
stat
(
log_directory
).
st_mode
)
!=
0o755
:
os
.
chmod
(
log_directory
,
0o755
)
os
.
chmod
(
log_directory
,
0o755
)
database
=
Database
(
log_directory
)
database
=
Database
(
log_directory
,
create
=
True
)
if
conf
.
has_option
(
"slapformat"
,
"computer_model_id"
):
if
conf
.
has_option
(
"slapformat"
,
"computer_model_id"
):
computer_model_id
=
conf
.
get
(
"slapformat"
,
computer_model_id
=
conf
.
get
(
"slapformat"
,
...
...
slapos/collect/db.py
View file @
84ff7a8c
...
@@ -119,7 +119,7 @@ class Database:
...
@@ -119,7 +119,7 @@ class Database:
" date, time) values "
\
" date, time) values "
\
"( '%s', '%s', %s, %s, %s, %s, '%s', '%s' )"
"( '%s', '%s', %s, %s, %s, %s, '%s', '%s' )"
def
__init__
(
self
,
directory
=
None
,
create
=
Tru
e
,
timeout
=
None
):
def
__init__
(
self
,
directory
=
None
,
create
=
Fals
e
,
timeout
=
None
):
assert
self
.
database_name
is
not
None
assert
self
.
database_name
is
not
None
if
directory
.
endswith
(
self
.
database_name
):
if
directory
.
endswith
(
self
.
database_name
):
directory
=
directory
[:
-
len
(
self
.
database_name
)]
directory
=
directory
[:
-
len
(
self
.
database_name
)]
...
...
slapos/tests/test_collect.py
View file @
84ff7a8c
...
@@ -100,7 +100,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -100,7 +100,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_database_bootstrap
(
self
):
def
test_database_bootstrap
(
self
):
self
.
assertFalse
(
os
.
path
.
exists
(
self
.
assertFalse
(
os
.
path
.
exists
(
"%s/collector.db"
%
self
.
instance_root
))
"%s/collector.db"
%
self
.
instance_root
))
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
self
.
assertEqual
(
self
.
assertEqual
(
...
@@ -112,10 +112,25 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -112,10 +112,25 @@ class TestCollectDatabase(unittest.TestCase):
self
.
assertTrue
(
os
.
path
.
exists
(
self
.
assertTrue
(
os
.
path
.
exists
(
"%s/collector.db"
%
self
.
instance_root
))
"%s/collector.db"
%
self
.
instance_root
))
def
test_database_not_bootstrap
(
self
):
self
.
assertFalse
(
os
.
path
.
exists
(
"%s/collector.db"
%
self
.
instance_root
))
database
=
db
.
Database
(
self
.
instance_root
)
database
.
connect
()
try
:
self
.
assertNotEqual
(
[
u'user'
,
u'folder'
,
u'computer'
,
u'system'
,
u'disk'
,
u'temperature'
,
u'heating'
],
database
.
getTableList
())
finally
:
database
.
close
()
self
.
assertTrue
(
os
.
path
.
exists
(
"%s/collector.db"
%
self
.
instance_root
))
def
test_database_select
(
self
):
def
test_database_select
(
self
):
def
_fake_execute
(
sql
):
return
sql
def
_fake_execute
(
sql
):
return
sql
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
original_execute
=
database
.
_execute
original_execute
=
database
.
_execute
try
:
try
:
...
@@ -133,7 +148,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -133,7 +148,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_insert_user_snapshot
(
self
):
def
test_insert_user_snapshot
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertUserSnapshot
(
database
.
insertUserSnapshot
(
...
@@ -148,7 +163,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -148,7 +163,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_insert_folder_snapshot
(
self
):
def
test_insert_folder_snapshot
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
inserFolderSnapshot
(
database
.
inserFolderSnapshot
(
...
@@ -161,7 +176,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -161,7 +176,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_insert_computer_snapshot
(
self
):
def
test_insert_computer_snapshot
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertComputerSnapshot
(
database
.
insertComputerSnapshot
(
...
@@ -174,7 +189,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -174,7 +189,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_insert_disk_partition_snapshot
(
self
):
def
test_insert_disk_partition_snapshot
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertDiskPartitionSnapshot
(
database
.
insertDiskPartitionSnapshot
(
...
@@ -187,7 +202,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -187,7 +202,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_insert_system_snapshot
(
self
):
def
test_insert_system_snapshot
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
...
@@ -202,7 +217,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -202,7 +217,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_date_scope
(
self
):
def
test_date_scope
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
...
@@ -224,7 +239,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -224,7 +239,7 @@ class TestCollectDatabase(unittest.TestCase):
database
.
close
()
database
.
close
()
def
test_garbage_collection_date_list
(
self
):
def
test_garbage_collection_date_list
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
3
)),
3
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
3
)),
3
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
1
)),
1
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
1
)),
1
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
0
)),
0
)
self
.
assertEqual
(
len
(
database
.
_getGarbageCollectionDateList
(
0
)),
0
)
...
@@ -234,7 +249,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -234,7 +249,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_garbage
(
self
):
def
test_garbage
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
'10.0'
,
'1'
,
'2'
,
'12.0'
,
'1'
,
'1'
,
'1983-01-10'
,
'TIME'
)
'10.0'
,
'1'
,
'2'
,
'12.0'
,
'1'
,
'1'
,
'1983-01-10'
,
'TIME'
)
...
@@ -272,7 +287,7 @@ class TestCollectDatabase(unittest.TestCase):
...
@@ -272,7 +287,7 @@ class TestCollectDatabase(unittest.TestCase):
def
test_mark_day_as_reported
(
self
):
def
test_mark_day_as_reported
(
self
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
try
:
try
:
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
...
@@ -310,7 +325,7 @@ class TestCollectReport(unittest.TestCase):
...
@@ -310,7 +325,7 @@ class TestCollectReport(unittest.TestCase):
shutil
.
rmtree
(
self
.
instance_root
)
shutil
.
rmtree
(
self
.
instance_root
)
def
getPopulatedDB
(
self
,
day
=
'1983-01-10'
,
amount
=
1
):
def
getPopulatedDB
(
self
,
day
=
'1983-01-10'
,
amount
=
1
):
database
=
db
.
Database
(
self
.
instance_root
)
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
database
.
connect
()
database
.
connect
()
for
i
in
range
(
0
,
amount
):
for
i
in
range
(
0
,
amount
):
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
database
.
insertSystemSnapshot
(
"0.1"
,
'10.0'
,
'100.0'
,
'100.0'
,
...
@@ -770,7 +785,7 @@ class TestConsumptionReportBase(unittest.TestCase):
...
@@ -770,7 +785,7 @@ class TestConsumptionReportBase(unittest.TestCase):
self
.
instance_root
=
tempfile
.
mkdtemp
()
self
.
instance_root
=
tempfile
.
mkdtemp
()
# inititalise
# inititalise
self
.
loadPredefinedDB
()
self
.
loadPredefinedDB
()
self
.
database
=
db
.
Database
(
self
.
instance_root
)
self
.
database
=
db
.
Database
(
self
.
instance_root
,
create
=
True
)
self
.
temp_dir
=
tempfile
.
mkdtemp
()
self
.
temp_dir
=
tempfile
.
mkdtemp
()
os
.
environ
[
"HOME"
]
=
self
.
temp_dir
os
.
environ
[
"HOME"
]
=
self
.
temp_dir
self
.
software_root
=
tempfile
.
mkdtemp
()
self
.
software_root
=
tempfile
.
mkdtemp
()
...
...
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