Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
feudalBackend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
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
feudal
feudalBackend
Commits
62c2d6b0
Commit
62c2d6b0
authored
Sep 25, 2020
by
lukas.burgey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove _assuer_states .. nonsense
parent
14b00c9c
Pipeline
#110835
failed with stage
in 1 minute and 17 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
31 deletions
+6
-31
feudal/backend/models/deployments.py
feudal/backend/models/deployments.py
+6
-27
feudal/backend/views/clients.py
feudal/backend/views/clients.py
+0
-4
No files found.
feudal/backend/models/deployments.py
View file @
62c2d6b0
...
...
@@ -111,20 +111,10 @@ class Deployment(PolymorphicModel):
def
target_reached
(
self
):
return
self
.
state_target
==
self
.
state
def
_assure_states_exist
(
self
):
# pragma: no cover
raise
NotImplementedError
(
'Should be overwritten in subclass'
)
def
update
(
self
):
self
.
_assure_states_exist
()
self
.
publish_to_user
()
# call when you changed Deployment.state_target
def
target_changed
(
self
):
LOGGER
.
debug
(
self
.
msg
(
'Target changed to {}'
.
format
(
self
.
state_target
)))
self
.
_assure_states_exist
()
for
item
in
self
.
states
.
all
():
item
.
dep_target_changed
()
...
...
@@ -192,18 +182,6 @@ class VODeployment(Deployment):
def
services
(
self
):
return
self
.
vo
.
services
.
all
()
# _assure_states_exist creates missing DeploymentState for this deployment
# returns True if new states were created
def
_assure_states_exist
(
self
):
created_new_states
=
False
for
service
in
self
.
services
:
_
,
created
=
DeploymentState
.
get_or_create
(
self
.
user
,
service
,
self
)
if
created
:
created_new_states
=
True
return
created_new_states
@
classmethod
def
get_deployment
(
cls
,
user
,
vo
):
deployment
,
created
=
cls
.
objects
.
get_or_create
(
...
...
@@ -215,6 +193,9 @@ class VODeployment(Deployment):
LOGGER
.
debug
(
deployment
.
msg
(
'Created'
))
deployment
.
update
()
# creates deployment states and publishes the creation
for
service
in
vo
.
services
.
all
():
DeploymentState
.
get_or_create
(
user
,
service
,
deployment
)
return
deployment
def
service_added
(
self
,
service
):
...
...
@@ -240,16 +221,14 @@ class ServiceDeployment(Deployment):
on_delete
=
models
.
CASCADE
,
)
def
_assure_states_exist
(
self
):
_
,
created
=
DeploymentState
.
get_or_create
(
self
.
user
,
self
.
service
,
self
)
return
created
@
classmethod
def
get_deployment
(
cls
,
user
,
service
):
deployment
,
created
=
cls
.
objects
.
get_or_create
(
user
=
user
,
service
=
service
)
if
created
:
LOGGER
.
debug
(
deployment
.
msg
(
'Created'
))
deployment
.
update
()
DeploymentState
.
get_or_create
(
user
,
service
,
deployment
)
return
deployment
...
...
feudal/backend/views/clients.py
View file @
62c2d6b0
...
...
@@ -86,10 +86,6 @@ class ConfigurationView(views.APIView):
except
VO
.
DoesNotExist
:
service
.
vos
.
add
(
vo
)
# we need to update the Deployments here
for
dep
in
vo
.
vo_deployments
.
all
():
dep
.
update
()
# returns the service ID to service mapping contained in the request
def
parse_sid_to_service
(
self
,
request
):
self
.
sid_to_service
=
{}
...
...
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