Skip to content
GitLab
Commit 8a4d00a3 authored by Marta Różańska's avatar Marta Różańska
Browse files

Merge branch 'cloudiator-deletion' into 'morph-rc1.5' 

deleted cloudiator dependencies

See merge request !27
parents a0c2a267 4831ae90
Pipeline #16660 passed with stages
in 15 minutes
Expand all Hide whitespace changes
Inline Side-by-side
cloudiator-client/src/main/resources/cloudiator.yaml deleted 100644 → 0
View file @ a0c2a267
This diff is collapsed.
interfaces/src/main/resources/services/frontend/frontend.raml
View file @ 8a4d00a3
......@@ -68,8 +68,8 @@ types:
type: object
properties:
nodeGroup:
description: A prefix all Cloudiator managed entities will belong to.
example: cloudiator
description: A prefix all cloud managed entities will belong to.
example: proactive
type: string
required: false
properties:
......@@ -121,4 +121,4 @@ types:
200:
body:
application/json:
type: DeploymentProcessResponse
\ No newline at end of file
type: DeploymentProcessResponse
mule_esb/mule-integration/src/main/app/implementation.xml
View file @ 8a4d00a3
......@@ -50,7 +50,7 @@ http://www.mulesoft.org/schema/mule/scripting http://www.mulesoft.org/schema/mul
<set-property propertyName="Content-Type" value="application/json" doc:name="set Content-Type to application/json"/>
</when>
<otherwise>
<enricher source="#[payload]" target="#[flowVars.feedCloudiatorResponse]" doc:name="Save entryRequest do variable (feedCloudiatorResponse)">
<enricher source="#[payload]" target="#[flowVars.ProactiveClient_Call_Msg]" doc:name="Save entryRequest do variable">
<flow-ref name="ProactiveClient_Call_addClouds" doc:name="ProactiveClient_Call_addClouds"/>
</enricher>
<logger message="ProactiveClient_Call middle processing payload: #[message.payloadAs(java.lang.String)]" level="INFO" doc:name="Logger"/>
......@@ -59,15 +59,10 @@ http://www.mulesoft.org/schema/mule/scripting http://www.mulesoft.org/schema/mul
<flow-ref name="deploymentProcess_POST" doc:name="deploymentProcess_POST"/>
</enricher>
<logger message="authorizationStatus: #[flowVars.authorizationStatus], autorization token: #[flowVars.melodicAuthorizationToken], refresh token: #[flowVars.refreshToken]" level="INFO" doc:name="Logger"/>
<logger message="feedCloudiatorResponse: #[flowVars.feedCloudiatorResponse]" level="INFO" doc:name="logger feedCloudiatorResponse"/>
<logger message="authorizationStatus: #[flowVars.authorizationStatus], autorization token: #[flowVars.melodicAuthorizationToken], refresh token: #[flowVars.refreshToken]" level="TRACE" doc:name="Logger"/>
<logger message="deploymentProcessResponse : #[flowVars.deploymentProcessResponse]" level="INFO" doc:name="logger deploymentProcessResponse"/>
<!--
<logger message="ncFetchReponse : #[flowVars.nodeCandidatesResponse]" level="INFO" doc:name="logger nodeCandidatesResponse"/>
<set-payload value="{ &quot;processCreationResult&quot;: #[flowVars.deploymentProcessResponse], &quot;createCloudsResponse&quot;: #[flowVars.feedCloudiatorResponse], &quot;processAuthorizationStatus&quot;: #[flowVars.authorizationStatus], &quot;ncQueryResponse&quot;: #[flowVars.nodeCandidatesResponse] }" doc:name="Set Payload"/>
-->
<set-payload value="{ &quot;processCreationResult&quot;: #[flowVars.deploymentProcessResponse], &quot;createCloudsResponse&quot;: #[flowVars.feedCloudiatorResponse], &quot;processAuthorizationStatus&quot;: #[flowVars.authorizationStatus] }" doc:name="Set Payload"/>
<set-payload value="{ &quot;processCreationResult&quot;: #[flowVars.deploymentProcessResponse], &quot;processAuthorizationStatus&quot;: #[flowVars.authorizationStatus] }" doc:name="Set Payload"/>
<set-property propertyName="Content-Type" value="application/json" doc:name="set Content-Type to application/json"/>
</otherwise>
......@@ -101,7 +96,7 @@ http://www.mulesoft.org/schema/mule/scripting http://www.mulesoft.org/schema/mul
<flow name="ProactiveClient_Call_addClouds">
<set-variable variableName="ProactiveClient_Call_Msg" value="#[message.payload]" doc:name="Variable"/>
<json:json-to-object-transformer returnClass="java.util.Map" doc:name="JSON to Object"/>
<logger message="ProactiveClient_Call_Msg: #[flowVars.ProactiveClient_Call_Msg]" level="INFO" doc:name="Logger"/>
<logger message="ProactiveClient_Call_Msg: #[flowVars.ProactiveClient_Call_Msg]" level="WARN" doc:name="Logger"/>
<set-payload value="#[message.payload.cloudDefinitions]" doc:name="Set Payload"/>
<logger message="Payload before invoking Proactive Client callAddClouds: #[message.payloadAs(java.lang.String)]" level="INFO" doc:name="Logger"/>
<invoke object-ref="proactiveClient" method="callAddClouds" doc:name="Invoke callAddClouds" methodArguments="#[payload]"/>
......
mule_esb/mule-integration/src/main/resources/eu.melodic.integration.mule.properties
View file @ 8a4d00a3
......@@ -16,16 +16,6 @@ solver_to_deployment.http.port=8096
adapter.http.host=mc3
adapter.http.port=8097
cloudiator.http.host=mc3
cloudiator.http.port=9000
cloudiator.http.xkey=secure
#http retry configuration when waiting for download Node Candidates
cloudiator.http.nodeCandidates.nb_of_retries=2
cloudiator.http.nodeCandidates.timeout=10000
cloudiator_proxy.http.host=0.0.0.0
cloudiator_proxy.http.port=8089
cp_solver.http.host=mc3
cp_solver.http.port=8093
cp_solver.useUtilityGenerator=false
......
mule_esb/mule-integration/src/main/resources/mocks/nodeCandidates
View file @ 8a4d00a3
......@@ -12,7 +12,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -94,7 +94,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -176,7 +176,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -258,7 +258,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -340,7 +340,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -422,7 +422,7 @@
"secret": "MySuperSecurePassword"
},
"cloudConfiguration": {
"nodeGroup": "cloudiator",
"nodeGroup": "",
"properties": [
{
"key": "sword.regions",
......@@ -491,4 +491,4 @@
}
}
}
]
\ No newline at end of file
]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment