Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CONF
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UvA
CONF
Commits
891efbfc
Commit
891efbfc
authored
May 30, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed setCloudProvider. We were setting OS name
parent
4c59918f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
DeployService.java
.../main/java/nl/uva/sne/drip/api/service/DeployService.java
+4
-4
AnsibleOutput.java
.../drip/commons/data/v1/external/ansible/AnsibleOutput.java
+0
-5
No files found.
drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
View file @
891efbfc
...
...
@@ -26,13 +26,11 @@ import java.util.Map;
import
java.util.concurrent.TimeoutException
;
import
java.util.logging.Level
;
import
java.util.logging.Logger
;
import
java.util.regex.Matcher
;
import
nl.uva.sne.drip.api.dao.DeployDao
;
import
nl.uva.sne.drip.api.exception.NotFoundException
;
import
nl.uva.sne.drip.api.rpc.DRIPCaller
;
import
nl.uva.sne.drip.api.rpc.DeployerCaller
;
import
nl.uva.sne.drip.api.v1.rest.DeployController
;
import
nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials
;
import
nl.uva.sne.drip.drip.commons.data.v1.external.DeployRequest
;
import
nl.uva.sne.drip.drip.commons.data.v1.external.DeployParameter
;
import
nl.uva.sne.drip.drip.commons.data.v1.external.DeployResponse
;
...
...
@@ -271,7 +269,7 @@ public class DeployService {
Map
<
String
,
String
>
nodeTypeCache
=
new
HashMap
<>();
Map
<
String
,
String
>
domainCache
=
new
HashMap
<>();
Map
<
String
,
String
>
osTypeCache
=
new
HashMap
<>();
//
Map<String, String> cloudProviderCache = new HashMap<>();
Map
<
String
,
String
>
cloudProviderCache
=
new
HashMap
<>();
for
(
AnsibleOutput
ansOut
:
outputList
)
{
Map
<
String
,
Object
>
map
=
provisionService
.
findOne
(
deployInfo
.
getProvisionID
()).
getKeyValue
();
...
...
@@ -316,6 +314,7 @@ public class DeployService {
}
}
os
=
(
String
)
component
.
get
(
"OStype"
);
nodeTypeCache
.
put
(
ansOut
.
getHost
(),
nodeType
);
domainCache
.
put
(
ansOut
.
getHost
(),
domain
);
osTypeCache
.
put
(
ansOut
.
getHost
(),
os
);
...
...
@@ -326,7 +325,8 @@ public class DeployService {
ansOut
.
setVmType
(
nodeType
);
ansOut
.
setCloudDeploymentDomain
(
domain
);
ansOut
.
setProvisionID
(
deployInfo
.
getProvisionID
());
ansOut
.
setCloudProviderName
(
os
);
// ansOut.setCloudProvider(provider);
ansOut
=
ansibleOutputService
.
save
(
ansOut
);
BenchmarkResult
benchmarkResult
=
parseSaveBenchmarkResult
(
ansOut
);
...
...
drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/ansible/AnsibleOutput.java
View file @
891efbfc
...
...
@@ -105,11 +105,6 @@ public class AnsibleOutput extends OwnedObject {
public
String
getProvisionID
()
{
return
provisionID
;
}
public
void
setCloudProviderName
(
String
cloudProvider
)
{
this
.
setCloudProvider
(
cloudProvider
);
}
/**
* @return the cloudProvider
*/
...
...
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