Merge branch 'rc3.1-to-master-candidate' into 'master'

Rc3.1 to master candidate

See merge request !16

.gitlab-ci.yml

@@ -3,6 +3,10 @@ stages:
 
 build-webssh-docker:
   stage: build-webssh-docker
+  only:
+    - master
+    - rc3.0
+    - rc3.1 
   image: docker:19.03.1
   services:
     - docker:19.03.1-dind

melodic_installation/.profile

@@ -29,7 +29,6 @@ get_public_ip() {
 http://ifconfig.me/
 http://icanhazip.com/
 http://ident.me/
-http://tnx.nl/ip
 http://whatismyip.akamai.com/
 http://bot.whatismyipaddress.com/
 http://l2.io/ip
@@ -163,7 +162,8 @@ alias drestart='function _drestart(){
                 options=$options" --scale "$service"=0"
             done
 
-            sudo sh -c "docker-compose create >> ~/logs/log/upperware.log 2>&1 && sudo docker-compose up $options >> ~/logs/log/upperware.log 2>&1 &"
+            # sudo sh -c "docker-compose create >> ~/logs/log/upperware.log 2>&1 && sudo docker-compose up $options >> ~/logs/log/upperware.log 2>&1 &"
+	        sudo sh -c "docker-compose up -d $options >> ~/logs/log/upperware.log 2>&1"
 
             if [ -f ~/docker/docker-compose.yml ]; then
                 cd ~/docker
@@ -174,8 +174,10 @@ alias drestart='function _drestart(){
                 do
                     options=$options" --scale "$service"=0"
                 done
-                sudo sh -c "docker-compose create >> ~/logs/log/executionware.log 2>&1 && sudo docker-compose up $options >> ~/logs/log/executionware.log 2>&1 &"
-                cd ~/
+                # sudo sh -c "docker-compose create >> ~/logs/log/executionware.log 2>&1 && sudo docker-compose up $options >> ~/logs/log/executionware.log 2>&1 &"
+                # sudo sh -c "docker-compose up -d $options >> ~/logs/log/executionware.log 2>&1"
+		        sudo sh -c "docker-compose up -d >> ~/logs/log/executionware.log 2>&1"
+		cd ~/
             fi
                 };_drestart'
 

melodic_installation/installMelodic.sh

@@ -108,7 +108,7 @@ install_cloudiator() {
   sudo sed -i "s/# INSTALLER_VISOR_DOWNLOAD=.*/INSTALLER_VISOR_DOWNLOAD=https:\/\/s3-eu-west-1.amazonaws.com\/melodic.testing.data\/ARTIFACTS\/visor\/visor-service-0.3.0-SNAPSHOT.jar/g" ~/docker/.env
   sudo sed -i "s/# INSTALLER_LANCE_DOWNLOAD=.*/INSTALLER_LANCE_DOWNLOAD=https:\/\/s3-eu-west-1.amazonaws.com\/melodic.testing.data\/ARTIFACTS\/lance\/server-0.3.0-SNAPSHOT.jar/g" ~/docker/.env
   sudo sed -i "s/# DLMS_WEBSERVICE_PORT/DLMS_WEBSERVICE_PORT/g" ~/docker/.env
-  sudo sed -i "s/# INSTALLER_DLMSAGENT_DOWNLOAD=.*/INSTALLER_DLMSAGENT_DOWNLOAD=https:\/\/s3-eu-west-1.amazonaws.com\/melodic.testing.data\/ARTIFACTS\/ow2\/dlmsagent\/DLMSAgent-3.0.0-SNAPSHOT.jar/g" ~/docker/.env
+  sudo sed -i "s/# INSTALLER_DLMSAGENT_DOWNLOAD=.*/INSTALLER_DLMSAGENT_DOWNLOAD=https:\/\/s3-eu-west-1.amazonaws.com\/melodic.testing.data\/ARTIFACTS\/ow2\/dlmsagent\/DLMSAgent-3.1.0-SNAPSHOT.jar/g" ~/docker/.env
   sudo sed -i "s/# INFLUX_URL=.*/INFLUX_URL=http:\/\/localhost:8086/g" ~/docker/.env
   sudo sed -i "s/# INFLUX_PASSWORD.*/INFLUX_PASSWORD=dummy/g" ~/docker/.env
 
@@ -170,7 +170,7 @@ if [[ -z $MELODIC_CONFIG_DIR ]]; then MELODIC_CONFIG_DIR=${BASEDIR}/conf; export
 TRUSTSTORE_FILE=~/conf/common/melodic-truststore.p12
 
 # Creation of key pairs, certificates of all components and population of common truststore
-MELODIC_SERVICES=(cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver dlmswebservice dlmscontroller ems gui-backend gui-frontend cloudiator ui-webssh)
+MELODIC_SERVICES=(cdoserver mule adapter generator cpsolver camunda memcache ldap metasolver jwtserver authdb authserver dlmswebservice dlmscontroller ems gui-backend functionizer-testing-tool gui-frontend cloudiator ui-webssh ptsolver ncsolver geneticsolver mctssolver)
 
 for i in ${MELODIC_SERVICES[*]}; do
     create_keystore_for $i

melodic_properties/templates/config/eu.functionizer.testingTool.properties

+#### Logback-config
+logging.config=file:${MELODIC_CONFIG_DIR}/logback-conf/logback-spring.xml

melodic_properties/templates/config/eu.melodic.integration.mule.properties

@@ -32,6 +32,18 @@ cp_solver.http.host=cpsolver
 cp_solver.http.port=8093
 cp_solver.useUtilityGenerator=true
 
+pt_solver.http.host=ptsolver
+pt_solver.http.port=9093
+
+nc_solver.http.host=ncsolver
+nc_solver.http.port=9092
+
+genetic_solver.http.host=geneticsolver
+genetic_solver.http.port=9091
+
+mcts_solver.http.host=mctssolver
+mcts_solver.http.port=9094
+
 #http retry configuration when requesting external systems
 eai.http.failover.nb_of_retries=10
 eai.http.failover.timeout=5000

melodic_properties/templates/config/eu.melodic.penalty.properties

+# Memcached settings
+memcache-host=${MEMCACHE_HOST:127.0.0.1}
+memcache-port=${MEMCACHE_PORT:11211}
 
-# Startup times per VM type
-startupTimes.t1.micro=50
-startupTimes.t1.small=100
-startupTimes.t1.xlarge=120
-startupTimes.t1.medium=110
-startupTimes.t1.xxlarge=130
-startupTimes.m1.tiny=55
-startupTimes.m1.small=79
-startupTimes.m1.medium=88
-startupTimes.m1.large=132
-startupTimes.m1.xlarge=140
-startupTimes.t1.large=110
+# InfluxDB settings
+influx-db-host=${INFLUX_DB_HOST}
+influx-db-port=${INFLUX_DB_PORT:8086}
+influx-db-username=${INFLUX_DB_USERNAME:vasilis}
+influx-db-password=${INFLUX_DB_PASSWORD}
+influx-db-name=${INFLUX_DB_NAME:cloudiator}
 
-# State info for VM characteristics
-
-#stateInfo=1,0.6,0.5;1,1.7,160;4,7.5,850;8,15,1690;7,17.1,420;5,2,350;1,0.5,0.5;1,2.048,10;2,4.096,10;4,8.192,20;8,16.384,40
-stateInfo=1,614,0.5;1,1741,160;4,7680,850;8,15360,1690;7,17510,420;5,2048,350;1,512,0.5;1,2097,10;2,4194,10;4,8389,20;8,16777,40
-
-# Memcached info
-
-host=127.0.0.1
-port=11211
 
+# Predefined VM type: names, startup times and characteristics (cores/ram/disk)
 vmData.t1_micro.startupTime=50
 vmData.t1_micro.cores=1
 vmData.t1_micro.ram=614
@@ -75,4 +64,100 @@ vmData.m1_xlarge.disk=20
 vmData.t1_large.startupTime=110
 vmData.t1_large.cores=8
 vmData.t1_large.ram=16777
-vmData.t1_large.disk=40
+vmData.t1_large.disk=40 
+#from here on the new additions
+
+vmData.tiny.startupTime=60
+vmData.tiny.cores=1
+vmData.tiny.ram=512
+vmData.tiny.disk=42
+
+vmData.t3_medium.startupTime=80
+vmData.t3_medium.cores=2
+vmData.t3_medium.ram=4194
+vmData.t3_medium.disk=42
+
+vmData.t2_medium.startupTime=80
+vmData.t2_medium.cores=2
+vmData.t2_medium.ram=4194
+vmData.t2_medium.disk=42
+
+vmData.m4_large.startupTime=132
+vmData.m4_large.cores=2
+vmData.m4_large.ram=4194
+vmData.m4_large.disk=10
+
+vmData.t3_small.startupTime=79
+vmData.t3_small.cores=1
+vmData.t3_small.ram=512
+vmData.t3_small.disk=0.5
+
+vmData.r4_large.startupTime=132
+vmData.r4_large.cores=2
+vmData.r4_large.ram=4194
+vmData.r4_large.disk=10
+
+vmData.c5_xlarge.startupTime=120
+vmData.c5_xlarge.cores=4
+vmData.c5_xlarge.ram=7680
+vmData.c5_xlarge.disk=850
+
+vmData.t2_micro.startupTime=50
+vmData.t2_micro.cores=1
+vmData.t2_micro.ram=614
+vmData.t2_micro.disk=0.5
+
+vmData.c5_large.startupTime=132
+vmData.c5_large.cores=2
+vmData.c5_large.ram=4194
+vmData.c5_large.disk=10
+
+vmData.m5_large.startupTime=132
+vmData.m5_large.cores=2
+vmData.m5_large.ram=4194
+vmData.m5_large.disk=10
+
+vmData.c4_xlarge.startupTime=145
+vmData.c4_xlarge.cores=4
+vmData.c4_xlarge.ram=8389
+vmData.c4_xlarge.disk=60
+
+vmData.c1_xlarge.startupTime=140
+vmData.c1_xlarge.cores=4
+vmData.c1_xlarge.ram=8389
+vmData.c1_xlarge.disk=70
+
+vmData.t2_large.startupTime=110
+vmData.t2_large.cores=8
+vmData.t2_large.ram=16777
+vmData.t2_large.disk=70
+
+vmData.t2_small.startupTime=79
+vmData.t2_small.cores=1
+vmData.t2_small.ram=512
+vmData.t2_small.disk=0.5
+
+vmData.c4_large.startupTime=132
+vmData.c4_large.cores=2
+vmData.c4_large.ram=4194
+vmData.c4_large.disk=10
+
+vmData.t3_large.startupTime=110
+vmData.t3_large.cores=8
+vmData.t3_large.ram=16777
+vmData.t3_large.disk=40
+
+vmData.t2_nano.startupTime=79
+vmData.t2_nano.cores=1
+vmData.t2_nano.ram=512
+vmData.t2_nano.disk=0.5
+
+vmData.v1_standard-1_05.startupTime=79
+vmData.v1_standard-1_05.cores=1
+vmData.v1_standard-1_05.ram=512
+vmData.v1_standard-1_05.disk=0.5
+
+vmData.t3_nano.startupTime=50
+vmData.t3_nano.cores=1
+vmData.t3_nano.ram=2194
+vmData.t3_nano.disk=12

melodic_properties/templates/config/eu.melodic.upperware.geneticsolver.properties

+#
+# Copyright (C) 2017 7bulls.com
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL
+# was not distributed with this file, You can obtain one at
+# http://mozilla.org/MPL/2.0/.
+#
+
+#### Communication with ESB ####
+esb.url=https://mule:8088
+
+#### REST interface port ####
+server.port = 9091
+
+### logback configuration ###
+logging.config=file:${MELODIC_CONFIG_DIR}/logback-conf/logback-spring.xml
\ No newline at end of file

melodic_properties/templates/config/eu.melodic.upperware.guiBackend.properties

@@ -11,6 +11,8 @@ jwtServer.url=http://jwtserver:8080
 adapter.url=http://adapter:8080
 #### MetaSolver settings
 metaSolver.url=http://metasolver:8092
+#### FunctionizerTestingTool settings
+functionizerTestingTool.url=http://functionizer-testing-tool:8080
 
 ### HTTPS configuration
 server.ssl.key-store=/certs/keystore.p12

melodic_properties/templates/config/eu.melodic.upperware.mctssolver.properties

+#
+# Copyright (C) 2017 7bulls.com
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL
+# was not distributed with this file, You can obtain one at
+# http://mozilla.org/MPL/2.0/.
+#
+
+#### Communication with ESB ####
+esb.url=https://mule:8088
+
+#### REST interface port ####
+server.port = 9094
+
+### logback configuration ###
+logging.config=file:${MELODIC_CONFIG_DIR}/logback-conf/logback-spring.xml
\ No newline at end of file

melodic_properties/templates/config/eu.melodic.upperware.metaSolver.properties

@@ -33,6 +33,9 @@ cdo.port = 2036
 cdo.repositoryName = repo1
 #cdo.secure = false
 
+#possible values: CPSOLVER, PTSOLVER, GENETICSOLVER, NCSOLVER, MCTSSOLVER
+defaultSolver=CPSOLVER
+
 #### New solutions must have utilities at least '1.1' times higher than the utility of the deployed solution
 utility-threshold-factor = 0
 

melodic_properties/templates/config/eu.melodic.upperware.ncsolver.properties

+#
+# Copyright (C) 2017 7bulls.com
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL
+# was not distributed with this file, You can obtain one at
+# http://mozilla.org/MPL/2.0/.
+#
+
+#### Communication with ESB ####
+esb.url=https://mule:8088
+
+#### REST interface port ####
+server.port = 9092
+
+### logback configuration ###
+logging.config=file:${MELODIC_CONFIG_DIR}/logback-conf/logback-spring.xml
\ No newline at end of file

melodic_properties/templates/config/eu.melodic.upperware.ptsolver.properties

+#
+# Copyright (C) 2017 7bulls.com
+#
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL
+# was not distributed with this file, You can obtain one at
+# http://mozilla.org/MPL/2.0/.
+#
+
+#### Communication with ESB ####
+esb.url=https://mule:8088
+
+#### REST interface port ####
+server.port = 9093
+
+### logback configuration ###
+logging.config=file:${MELODIC_CONFIG_DIR}/logback-conf/logback-spring.xml
\ No newline at end of file

melodic_properties/templates/config/gui-data.yaml

-!!eu.melodic.upperware.guibackend.properties.GuiYamlData
 byonDefinitions:
 cloudDefinitions:
   - api: {id: 1, providerName: openstack4j}

melodic_properties/templates/config/logback-conf/logback-spring.xml

@@ -16,6 +16,7 @@
 
     <logger name="org.springframework.web.filter.CommonsRequestLoggingFilter" level="DEBUG"/>
 
+    <logger name="eu.melodic.upperware.zppsolver" level = "INFO"/>
     <logger name="eu.melodic.upperware.cpsolver" level="INFO"/>
     <!-- choco solver begin -->
     <logger name="choco" level="WARN"/>
@@ -45,6 +46,8 @@
 
     <!-- DLMSWebService -->
     <logger name="eu.melodic.upperware.dlms" level="DEBUG"/>
+    <logger name="eu.melodic.dlms" level="INFO"/>
+
 
     <!-- DLMSController, DLMSUtility -->
     <logger name="eu.melodic.dlms" level="DEBUG"/>
@@ -59,4 +62,7 @@
     <logger name="eu.melodic.event.translate" level="DEBUG"/>
     <logger name="eu.melodic.event.util" level="DEBUG"/>
     <logger name="eu.melodic.event.util.NetUtil" level="INFO"/>
-</configuration>
\ No newline at end of file
+
+    <!-- functionizer testing tool -->
+    <logger name="eu.functionizer.functionizertestingtool" level="DEBUG"/>
+</configuration>

melodic_properties/templates/config/tests/tests.yml

+tests:
+  - functionName: ExampleLambdaFunction
+    testCases:
+      - event: "\"example string event\""
+        expectedOutput: "\"expected string response to example event\""
+  - functionName: SecondExampleLambdaFunction
+    testCases:
+      - event: "{\"message\": \"example json event\"}"
+        expectedOutput: "{\"code\": 200 ,\"body\": {\"result\": \"expected json response\"}}"
+      - event: "{\"text\": \"another json event\"}"
+        expectedOutput: "{\"code\": 400, \"body\": {\"message\": \"failure reason\"}}"
+  - functionName: ExampleAzureFunction
+    triggerPath: example
+    testCases:
+      - event: "1"
+        expectedOutput: "\"Response to the integer event\""

melodic_properties/templates/melodicStack/docker-compose.yml

@@ -173,6 +173,90 @@ services:
       - 5016:5005
     networks:
       - elk
+  ptsolver:
+    image: gitlab.ow2.org:4567/melodic/melodic-upperware/ptsolver:${IMAGE_BRANCH}
+    logging:
+      driver: journald
+      options:
+        tag: ptsolver
+    volumes:
+      - /tmp:/tmp
+      - ~/conf:/config
+      - ~/logs:/logs
+    environment:
+      - PAASAGE_CONFIG_DIR=/config
+      - spring.config.location=/config/eu.melodic.upperware.ptsolver.properties,/config/eu.melodic.upperware.security.properties
+      - LOG_FILE=/logs/ptsolver.log
+      - CDO_HOST=cdoserver
+      - CDO_PORT=2036
+      - MELODIC_CONFIG_DIR=/config
+    ports:
+      - 9093:9093
+    networks:
+      - elk
+  ncsolver:
+    image: gitlab.ow2.org:4567/melodic/melodic-upperware/ncsolver:${IMAGE_BRANCH}
+    logging:
+      driver: journald
+      options:
+        tag: ncsolver
+    volumes:
+      - /tmp:/tmp
+      - ~/conf:/config
+      - ~/logs:/logs
+    environment:
+      - PAASAGE_CONFIG_DIR=/config
+      - spring.config.location=/config/eu.melodic.upperware.ncsolver.properties,/config/eu.melodic.upperware.security.properties
+      - LOG_FILE=/logs/ncsolver.log
+      - CDO_HOST=cdoserver
+      - CDO_PORT=2036
+      - MELODIC_CONFIG_DIR=/config
+    ports:
+      - 9092:9092
+    networks:
+      - elk
+  geneticsolver:
+    image: gitlab.ow2.org:4567/melodic/melodic-upperware/geneticsolver:${IMAGE_BRANCH}
+    logging:
+      driver: journald
+      options:
+        tag: geneticsolver
+    volumes:
+      - /tmp:/tmp
+      - ~/conf:/config
+      - ~/logs:/logs
+    environment:
+      - PAASAGE_CONFIG_DIR=/config
+      - spring.config.location=/config/eu.melodic.upperware.geneticsolver.properties,/config/eu.melodic.upperware.security.properties
+      - LOG_FILE=/logs/geneticsolver.log
+      - CDO_HOST=cdoserver
+      - CDO_PORT=2036
+      - MELODIC_CONFIG_DIR=/config
+    ports:
+      - 9091:9091
+    networks:
+      - elk
+  mctssolver:
+      image: gitlab.ow2.org:4567/melodic/melodic-upperware/mctssolver:${IMAGE_BRANCH}
+      logging:
+        driver: journald
+        options:
+          tag: mctssolver
+      volumes:
+        - /tmp:/tmp
+        - ~/conf:/config
+        - ~/logs:/logs
+      environment:
+        - PAASAGE_CONFIG_DIR=/config
+        - spring.config.location=/config/eu.melodic.upperware.mctssolver.properties,/config/eu.melodic.upperware.security.properties
+        - LOG_FILE=/logs/mctssolver.log
+        - CDO_HOST=cdoserver
+        - CDO_PORT=2036
+        - MELODIC_CONFIG_DIR=/config
+      ports:
+        - 9094:9094
+      networks:
+        - elk
   camunda:
     image: gitlab.ow2.org:4567/melodic/melodic-integration/process:${IMAGE_BRANCH}
     logging:
@@ -438,6 +522,26 @@ services:
       - 8078:8080
     networks:
       - elk
+  functionizer-testing-tool:
+    image: gitlab.ow2.org:4567/melodic/melodic-upperware/functionizer-testing-tool:${IMAGE_BRANCH}
+    logging:
+      driver: journald
+      options:
+        tag: functionizer-testing-tool
+    volumes:
+      - ~/conf:/config
+      - ~/logs:/logs
+    environment:
+      - PAASAGE_CONFIG_DIR=/config
+      - MELODIC_CONFIG_DIR=/config
+      - spring.config.location=/config/eu.functionizer.testingTool.properties
+      - LOG_FILE=/logs/functionizer-testing-tool.log
+      - CDO_HOST=cdoserver
+      - CDO_PORT=2036
+    ports:
+      - 8077:8080
+    networks:
+      - elk
   # nginx server with user interface
   gui-frontend:
     image: gitlab.ow2.org:4567/melodic/melodic-frontend:${IMAGE_BRANCH}
@@ -504,7 +608,6 @@ services:
       - 9200:9200
     networks:
       - elk
-
   kibana:
     image: amazon/opendistro-for-elasticsearch-kibana:1.1.0
     environment:
@@ -518,7 +621,6 @@ services:
       - elasticsearch
     networks:
       - elk
-
   logstash:
     image: docker.elastic.co/logstash/logstash-oss:6.6.2
     volumes:

metric_generator/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.melodic</groupId>
     <artifactId>metric-generator</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>