rename sure-tosca.base.path

bin/docker_pull.sh

+#!/bin/bash
+
+docker pull alogo53/manager:3.0.0
+docker pull alogo53/provisioner:3.0.0
+docker pull alogo53/sure-tosca:3.0.0
+docker pull alogo53/planner:3.0.0
+docker pull alogo53/deployer:3.0.0

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

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);

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

docker-compose.yml

@@ -91,18 +91,18 @@ services:
     #image: jupyter/base-notebook    
     
     
-  #manager:
-    #depends_on:
-      #- rabbit
-      #- mongo
-      #- sure-tosca
-    #image: alogo53/manager:3.0.0
-    #environment:
-      #RABBITMQ_HOST: rabbit
-      #MONGO_HOST: mongo
-      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-    #ports:
-      #- "30000:8080"       
+  manager:
+    depends_on:
+      - rabbit
+      - mongo
+      - sure-tosca
+    image: alogo53/manager:3.0.0
+    environment:
+      RABBITMQ_HOST: rabbit
+      MONGO_HOST: mongo
+      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+    ports:
+      - "30000:8080"       
             
   sure-tosca:
     image: alogo53/sure-tosca:3.0.0
@@ -117,14 +117,14 @@ services:
     environment:
       RABBITMQ_HOST: rabbit
     
-  provisioner:
-    depends_on:
-      - rabbit
-      - sure-tosca
-    image: alogo53/provisioner:3.0.0
-    environment:
-      RABBITMQ_HOST: rabbit      
-      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0      
+  #provisioner:
+    #depends_on:
+      #- rabbit
+      #- sure-tosca
+    #image: alogo53/provisioner:3.0.0
+    #environment:
+      #RABBITMQ_HOST: rabbit      
+      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0      
 
       
 #volumes:

manager/Dockerfile

@@ -4,7 +4,7 @@ COPY target/manager-3.0.0.jar manager-3.0.0.jar
 CMD jar -xf 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=$MONGO_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 manager-3.0.0.jar BOOT-INF/classes/application.properties && \
     java -jar manager-3.0.0.jar

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

manager/src/main/resources/application.properties

@@ -17,4 +17,4 @@ db.name=drip
 db.username=drip-user
 db.password=drip-pass
 
-sure_tosca.base.path=http://localhost:8081/tosca-sure/1.0.0
\ No newline at end of file
+sure-tosca.base.path=http://localhost:8081/tosca-sure/1.0.0
\ No newline at end of file

provisioner/Dockerfile

@@ -5,7 +5,7 @@ COPY etc/ etc
 CMD jar -xf provisioner-3.0.0-jar-with-dependencies.jar application.properties && \
     cat application.properties && \
     sed -ie "s#^message.broker.host=.*#message.broker.host=$RABBITMQ_HOST#" application.properties && \ 
-    sed -ie "s#^sure_tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" application.properties && \
+    sed -ie "s#^sure-tosca.base.path=.*#sure-tosca.base.path=$SURE_TOSCA_BASE_PATH#" application.properties && \
     echo "cloud.storm.db.path=/etc/UD" >> application.properties && \
     cat application.properties && \
     jar -uf provisioner-3.0.0-jar-with-dependencies.jar application.properties && \

provisioner/src/main/resources/application.properties

@@ -4,5 +4,5 @@ message.broker.password=guest
 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/
 cloud.storm.db.path=etc/UD
\ No newline at end of file