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
72508c0c
Commit
72508c0c
authored
Jul 13, 2017
by
Spiros Koulouzis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check if proxy is there
parent
89ba6361
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
AAUtils.java
.../src/main/java/nl/uva/sne/drip/commons/utils/AAUtils.java
+5
-4
Consumer.java
...in/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
+10
-1
No files found.
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/AAUtils.java
View file @
72508c0c
...
...
@@ -86,10 +86,11 @@ public class AAUtils {
case
PROXY_FILE:
secretKey
+=
"\n"
;
proxy_file
=
new
File
(
"/tmp/x509up_u1000"
);
if
(
proxy_file
.
exists
())
{
Set
<
PosixFilePermission
>
perm
=
new
HashSet
<>();
perm
.
add
(
PosixFilePermission
.
OWNER_WRITE
);
Files
.
setPosixFilePermissions
(
proxy_file
.
toPath
(),
perm
);
}
Files
.
write
(
proxy_file
.
toPath
(),
secretKey
.
getBytes
());
break
;
case
CERTIFICATE:
...
...
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
View file @
72508c0c
...
...
@@ -58,6 +58,7 @@ import provisioning.database.EGI.EGIDatabase;
import
provisioning.database.UserDatabase
;
import
provisioning.engine.TEngine.TEngine
;
import
provisioning.engine.VEngine.EGI.EGIAgent
;
import
provisioning.request.ScalingRequest
;
import
topologyAnalysis.TopologyAnalysisMain
;
import
topologyAnalysis.dataStructure.SubTopologyInfo
;
import
topologyAnalysis.dataStructure.VM
;
...
...
@@ -506,7 +507,15 @@ public class Consumer extends DefaultConsumer {
}
Message
response
=
new
Message
();
try
{
tEngine
.
autoScal
(
tam
.
wholeTopology
,
userCredential
,
userDatabase
,
tam
.
wholeTopology
.
topologies
.
get
(
0
).
topology
,
true
,
scalDCs
);
ScalingRequest
scalReq
=
new
ScalingRequest
();
scalReq
.
cloudProvider
=
"ec2"
;
scalReq
.
domain
=
"Ohio"
;
scalReq
.
satisfied
=
false
;
ArrayList
<
ScalingRequest
>
scalDCs
=
new
ArrayList
<>();
scalDCs
.
add
(
scalReq
);
tEngine
.
autoScal
(
tam
.
wholeTopology
,
userCredential
,
userDatabase
,
"ec2_zh_b"
,
true
,
scalDCs
);
}
catch
(
Throwable
ex
)
{
ObjectMapper
mapper
=
new
ObjectMapper
();
mapper
.
configure
(
JsonParser
.
Feature
.
ALLOW_SINGLE_QUOTES
,
true
);
...
...
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