Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Platform
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nmaas
nmaas Platform
Commits
3a3ff9c0
Commit
3a3ff9c0
authored
1 week ago
by
Patryk Kazimierowski
Browse files
Options
Downloads
Patches
Plain Diff
added service for scaling via event
parent
ea8a77eb
No related branches found
No related tags found
1 merge request
!212
Resolve "Add application instance scaling support" -add api
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/net/geant/nmaas/portal/api/market/AppInstanceController.java
+26
-42
26 additions, 42 deletions
.../geant/nmaas/portal/api/market/AppInstanceController.java
with
26 additions
and
42 deletions
src/main/java/net/geant/nmaas/portal/api/market/AppInstanceController.java
+
26
−
42
View file @
3a3ff9c0
...
...
@@ -5,50 +5,26 @@ import jakarta.validation.constraints.NotNull;
import
lombok.extern.slf4j.Slf4j
;
import
net.geant.nmaas.nmservice.configuration.gitlab.events.AddUserToRepositoryGitlabEvent
;
import
net.geant.nmaas.nmservice.configuration.gitlab.events.RemoveUserFromRepositoryGitlabEvent
;
import
net.geant.nmaas.orchestration.AppDeploymentMonitor
;
import
net.geant.nmaas.orchestration.AppDeploymentRepositoryManager
;
import
net.geant.nmaas.orchestration.AppLifecycleManager
;
import
net.geant.nmaas.orchestration.AppLifecycleState
;
import
net.geant.nmaas.orchestration.Identifier
;
import
net.geant.nmaas.orchestration.*
;
import
net.geant.nmaas.orchestration.api.model.AppDeploymentHistoryView
;
import
net.geant.nmaas.orchestration.entities.AppDeployment
;
import
net.geant.nmaas.orchestration.events.app.AppScaleActionEvent
;
import
net.geant.nmaas.orchestration.exceptions.InvalidAppStateException
;
import
net.geant.nmaas.orchestration.exceptions.InvalidDeploymentIdException
;
import
net.geant.nmaas.orchestration.exceptions.InvalidDomainException
;
import
net.geant.nmaas.portal.api.domain.AppInstanceBase
;
import
net.geant.nmaas.portal.api.domain.AppInstanceRequest
;
import
net.geant.nmaas.portal.api.domain.AppInstanceState
;
import
net.geant.nmaas.portal.api.domain.AppInstanceStatus
;
import
net.geant.nmaas.portal.api.domain.AppInstanceView
;
import
net.geant.nmaas.portal.api.domain.AppInstanceViewExtended
;
import
net.geant.nmaas.portal.api.domain.ApplicationBaseView
;
import
net.geant.nmaas.portal.api.domain.ConfigWizardTemplateView
;
import
net.geant.nmaas.portal.api.domain.Id
;
import
net.geant.nmaas.portal.api.domain.UserBase
;
import
net.geant.nmaas.portal.api.domain.*
;
import
net.geant.nmaas.portal.api.exception.MissingElementException
;
import
net.geant.nmaas.portal.api.exception.ProcessingException
;
import
net.geant.nmaas.portal.exceptions.ApplicationSubscriptionNotActiveException
;
import
net.geant.nmaas.portal.persistent.entity.AppInstance
;
import
net.geant.nmaas.portal.persistent.entity.Application
;
import
net.geant.nmaas.portal.persistent.entity.ApplicationBase
;
import
net.geant.nmaas.portal.persistent.entity.Domain
;
import
net.geant.nmaas.portal.persistent.entity.Role
;
import
net.geant.nmaas.portal.persistent.entity.SSHKeyEntity
;
import
net.geant.nmaas.portal.persistent.entity.User
;
import
net.geant.nmaas.portal.persistent.entity.UserRole
;
import
net.geant.nmaas.portal.service.ApplicationBaseService
;
import
net.geant.nmaas.portal.service.ApplicationInstanceService
;
import
net.geant.nmaas.portal.service.ApplicationService
;
import
net.geant.nmaas.portal.service.ConfigurationManager
;
import
net.geant.nmaas.portal.service.DomainService
;
import
net.geant.nmaas.portal.service.UserService
;
import
net.geant.nmaas.portal.persistent.entity.*
;
import
net.geant.nmaas.portal.service.*
;
import
org.modelmapper.ModelMapper
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.context.ApplicationEventPublisher
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.domain.Sort
;
import
org.springframework.http.
ResponseEntity
;
import
org.springframework.http.
HttpStatus
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.core.userdetails.UsernameNotFoundException
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -56,11 +32,7 @@ import org.springframework.web.bind.annotation.*;
import
java.lang.reflect.Field
;
import
java.security.Principal
;
import
java.util.Arrays
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.*
;
import
java.util.stream.Collectors
;
@RestController
...
...
@@ -248,7 +220,7 @@ public class AppInstanceController extends AppBaseController {
public
Id
createAppInstance
(
@RequestBody
AppInstanceRequest
appInstanceRequest
,
@NotNull
Principal
principal
,
@PathVariable
Long
domainId
,
@RequestParam
(
name
=
"clusterId"
,
required
=
false
)
Long
clusterId
)
{
@RequestParam
(
name
=
"clusterId"
,
required
=
false
)
Long
clusterId
)
{
log
.
error
(
"Cluster = {}"
,
clusterId
);
Application
app
=
getApp
(
appInstanceRequest
.
getApplicationId
());
Domain
domain
=
domainService
.
findDomain
(
domainId
)
...
...
@@ -757,22 +729,34 @@ public class AppInstanceController extends AppBaseController {
}
return
pageable
;
}
/**
* @param deploymentId unique identifier of the deployed user application
*/
@PutMapping
(
"/{deploymentId}/scale-down"
)
public
ResponseEntity
<
Void
>
scaleDownApp
(
@PathVariable
String
deploymentId
)
{
appLifecycleManager
.
scaleDown
(
new
Identifier
(
deploymentId
));
return
ResponseEntity
.
ok
().
build
();
@ResponseStatus
(
HttpStatus
.
NO_CONTENT
)
public
void
scaleDownApp
(
@PathVariable
String
deploymentId
)
{
eventPublisher
.
publishEvent
(
new
AppScaleActionEvent
(
this
,
new
Identifier
(
deploymentId
),
ScaleDirection
.
DOWN
)
);
}
/**
* @param deploymentId unique identifier of the deployed user application
*/
@PutMapping
(
"/{deploymentId}/scale-up"
)
public
ResponseEntity
<
Void
>
scaleUpApp
(
@PathVariable
String
deploymentId
)
{
appLifecycleManager
.
scaleUp
(
new
Identifier
(
deploymentId
));
return
ResponseEntity
.
ok
().
build
();
@ResponseStatus
(
HttpStatus
.
NO_CONTENT
)
public
void
scaleUpApp
(
@PathVariable
String
deploymentId
)
{
eventPublisher
.
publishEvent
(
new
AppScaleActionEvent
(
this
,
new
Identifier
(
deploymentId
),
ScaleDirection
.
UP
)
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment