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
53439bfd
Commit
53439bfd
authored
1 month ago
by
Patryk Kazimierowski
Browse files
Options
Downloads
Patches
Plain Diff
some changes
parent
6a5fb05a
No related branches found
No related tags found
2 merge requests
!273
Release 1.8.0 update
,
!212
Resolve "Add application instance scaling support" -add api
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/test/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManagerTest.java
+6
-4
6 additions, 4 deletions
...t/nmaas/orchestration/DefaultAppLifecycleManagerTest.java
with
6 additions
and
4 deletions
src/test/java/net/geant/nmaas/orchestration/DefaultAppLifecycleManagerTest.java
+
6
−
4
View file @
53439bfd
...
...
@@ -2,6 +2,7 @@ package net.geant.nmaas.orchestration;
import
net.geant.nmaas.nmservice.NmServiceDeploymentStateChangeEvent
;
import
net.geant.nmaas.nmservice.deployment.NmServiceRepositoryManager
;
import
net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.KServiceLifecycleManager
;
import
net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.KubernetesRepositoryManager
;
import
net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.components.janitor.JanitorService
;
import
net.geant.nmaas.nmservice.deployment.containerorchestrators.kubernetes.entities.KubernetesNmServiceInfo
;
...
...
@@ -48,6 +49,7 @@ public class DefaultAppLifecycleManagerTest {
private
final
NmServiceRepositoryManager
<
KubernetesNmServiceInfo
>
serviceRepositoryManager
=
mock
(
KubernetesRepositoryManager
.
class
);
private
final
JanitorService
janitorService
=
mock
(
JanitorService
.
class
);
private
final
AppTermsAcceptanceService
appTermsAcceptanceService
=
mock
(
AppTermsAcceptanceService
.
class
);
private
final
KServiceLifecycleManager
kServiceLifecycleManager
=
mock
(
KServiceLifecycleManager
.
class
);
private
DefaultAppLifecycleManager
appLifecycleManager
;
...
...
@@ -55,7 +57,7 @@ public class DefaultAppLifecycleManagerTest {
@BeforeEach
void
setup
()
{
appLifecycleManager
=
new
DefaultAppLifecycleManager
(
repositoryManager
,
eventPublisher
,
serviceRepositoryManager
,
janitorService
,
appTermsAcceptanceService
,
configurationManager
);
appLifecycleManager
=
new
DefaultAppLifecycleManager
(
repositoryManager
,
eventPublisher
,
serviceRepositoryManager
,
janitorService
,
kServiceLifecycleManager
,
appTermsAcceptanceService
,
configurationManager
);
}
@Test
...
...
@@ -84,7 +86,7 @@ public class DefaultAppLifecycleManagerTest {
AppConfigurationView
configurationView
=
mock
(
AppConfigurationView
.
class
);
when
(
configurationView
.
getStorageSpace
()).
thenReturn
(
null
);
when
(
configurationView
.
getJsonInput
()).
thenReturn
(
""
);
appLifecycleManager
.
applyConfiguration
(
new
Identifier
(),
configurationView
,
"TEST"
);
appLifecycleManager
.
applyConfiguration
(
new
Identifier
(),
configurationView
,
"TEST"
);
verify
(
repositoryManager
,
times
(
1
)).
update
(
any
());
verify
(
serviceRepositoryManager
,
times
(
0
)).
updateStorageSpace
(
any
(),
anyInt
());
verify
(
serviceRepositoryManager
,
times
(
0
)).
addAdditionalParameters
(
any
(),
anyMap
());
...
...
@@ -100,7 +102,7 @@ public class DefaultAppLifecycleManagerTest {
when
(
configurationView
.
getAdditionalParameters
()).
thenReturn
(
"{\"keyadd1\": \"valadd1\"}"
);
when
(
configurationView
.
getMandatoryParameters
()).
thenReturn
(
"{\"keyman1\": \"valman1\", \"keyman2\": \"valman2\"}"
);
when
(
configurationView
.
getJsonInput
()).
thenReturn
(
""
);
appLifecycleManager
.
applyConfiguration
(
Identifier
.
newInstance
(
1L
),
configurationView
,
"TEST"
);
appLifecycleManager
.
applyConfiguration
(
Identifier
.
newInstance
(
1L
),
configurationView
,
"TEST"
);
ArgumentCaptor
<
Identifier
>
idArg
=
ArgumentCaptor
.
forClass
(
Identifier
.
class
);
ArgumentCaptor
<
Map
<
String
,
String
>>
mapArg
=
ArgumentCaptor
.
forClass
(
Map
.
class
);
verify
(
serviceRepositoryManager
,
times
(
1
)).
updateStorageSpace
(
Identifier
.
newInstance
(
1L
),
10
);
...
...
@@ -115,7 +117,7 @@ public class DefaultAppLifecycleManagerTest {
when
(
serviceRepositoryManager
.
loadService
(
any
())).
thenReturn
(
new
KubernetesNmServiceInfo
());
AppConfigurationView
configurationView
=
mock
(
AppConfigurationView
.
class
);
when
(
configurationView
.
getJsonInput
()).
thenReturn
(
""
);
appLifecycleManager
.
applyConfiguration
(
new
Identifier
(),
configurationView
,
"TEST"
);
appLifecycleManager
.
applyConfiguration
(
new
Identifier
(),
configurationView
,
"TEST"
);
verify
(
eventPublisher
,
times
(
1
)).
publishEvent
(
any
(
AppApplyConfigurationActionEvent
.
class
));
}
...
...
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