rename property

drip-commons/src/main/resources/application.properties

@@ -5,4 +5,4 @@ message.broker.queue.provisioner=provisioner
 message.broker.queue.planner=planner
 message.broker.queue.deployer=deployer
 
-sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0
+sure_tosca.base.path=http://localhost:8081/tosca-sure/1.0.0

drip-commons/src/test/java/nl/uva/sne/drip/commons/utils/ToscaHelperTest.java

@@ -74,7 +74,7 @@ public class ToscaHelperTest {
         objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
         toscaTemplate = objectMapper.readValue(ymlStr, ToscaTemplate.class);
-        String serviceBasePath = prop.getProperty("sure-tosca.base.path");
+        String serviceBasePath = prop.getProperty("sure_tosca.base.path");
         serviceUp = isServiceUp(serviceBasePath);
         if (serviceUp) {
             instance = new ToscaHelper(serviceBasePath);

drip-commons/src/test/resources/application.properties

@@ -5,4 +5,4 @@ message.broker.queue.provisioner=provisioner
 message.broker.queue.planner=planner
 message.broker.queue.deployer=deployer
 
-sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0
+sure_tosca.base.path=http://localhost:8081/tosca-sure/1.0.0

drip-manager/Dockerfile

@@ -5,7 +5,7 @@ COPY target/drip-manager-3.0.0.jar drip-manager-3.0.0.jar
 CMD jar -xf drip-manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     sed -ie "s/^message.broker.host=.*/message.broker.host=$RABBITMQ_HOST/" BOOT-INF/classes/application.properties && \ 
     sed -ie "s/^db.host=.*/db.host=$MONOG_HOST/" BOOT-INF/classes/application.properties && \ 
-    sed -ie "s/^sure-tosca.base.path=.*/sure-tosca.base.path=$SURE_TOSCA_BASE_PATH/" BOOT-INF/classes/application.properties && \
+    sed -ie "s/^sure_tosca.base.path=.*/sure_tosca.base.path=$SURE_TOSCA_BASE_PATH/" BOOT-INF/classes/application.properties && \
     cat BOOT-INF/classes/application.properties && \
     jar -uf drip-manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     java -jar drip-manager-3.0.0.jar

drip-manager/src/main/java/nl/uva/sne/drip/configuration/ToscaHelperConfig.java

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.PropertySources;
 @ComponentScan(basePackages = {"nl.uva.sne.drip", "nl.uva.sne.drip.api", "nl.uva.sne.drip.configuration", "nl.uva.sne.drip.dao", "nl.uva.sne.drip.model", "nl.uva.sne.drip.service", "nl.uva.sne.drip.commons.utils"})
 public class ToscaHelperConfig {
 
-    @Value("${sure-tosca.base.path}")
+    @Value("${sure_tosca.base.path}")
     private String sureToscaBasePath;
 
     @Bean

drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java

@@ -80,7 +80,7 @@ class CloudStormService {
         this.toscaTemplate = toscaTemplate;
         cloudStormDBPath = properties.getProperty("cloud.storm.db.path");
         cloudStormDAO = new CloudStormDAO(cloudStormDBPath);
-        String sureToscaBasePath = properties.getProperty("sure-tosca.base.path");
+        String sureToscaBasePath = properties.getProperty("sure_tosca.base.path");
         this.helper = new ToscaHelper(sureToscaBasePath);
         this.helper.uploadToscaTemplate(toscaTemplate);
         this.objectMapper = new ObjectMapper(new YAMLFactory().disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER));