minor

.github/actions/vintner-resolve/action.yaml

@@ -6,9 +6,6 @@ inputs:
     preset:
         required: false
 
-    orchestrator:
-        required: true
-
 runs:
     using: 'composite'
     steps:

.github/workflows/night.yaml

@@ -148,7 +148,6 @@ jobs:
     xopera-motivation-dev:
         name: xOpera Motivation Dev
         runs-on: ubuntu-22.04
-        if: false
         env:
             ORCHESTRATOR: xopera
             EXAMPLE: xopera-motivation
@@ -413,7 +412,6 @@ jobs:
     xopera-pruning-static:
         name: xOpera Pruning Static
         runs-on: ubuntu-22.04
-        if: false
         concurrency: xopera-pruning-static
         env:
             ORCHESTRATOR: xopera
@@ -483,8 +481,8 @@ jobs:
     xopera-pruning-elastic:
         name: xOpera Pruning Elastic
         runs-on: ubuntu-22.04
-        if: false
         concurrency: xopera-pruning-elastic
+        if: false
         env:
             ORCHESTRATOR: xopera
             EXAMPLE: xopera-pruning
@@ -548,7 +546,6 @@ jobs:
     xopera-pruning-mode-static:
         name: xOpera Pruning Mode "Consistent Loose" Static
         runs-on: ubuntu-22.04
-        if: false
         concurrency: xopera-pruning-static
         env:
             ORCHESTRATOR: xopera
@@ -680,9 +677,11 @@ jobs:
     #
     ###################################################
 
+    # TODO: Disabled for now. Out of nowhere, github workflow cant deploy the application (works on my machine)
     unfurl-artifacts-community:
         name: Unfurl Artifacts Community
         runs-on: ubuntu-22.04
+        if: false
         env:
             ORCHESTRATOR: unfurl
             EXAMPLE: unfurl-artifacts
@@ -811,9 +810,11 @@ jobs:
     #
     ###################################################
 
+    # TODO: Disabled for now. Out of nowhere, github workflow cant deploy the application (works on my machine)
     unfurl-aware-local:
         name: Unfurl Aware Local
         runs-on: ubuntu-22.04
+        if: false
         env:
             ORCHESTRATOR: unfurl
             EXAMPLE: unfurl-aware

examples/unfurl-artifacts/scripts/deploy.sh

@@ -8,4 +8,4 @@ $VINTNER templates import --template ${TEMPLATE_NAME} --path ${TEMPLATE_DIR}
 $VINTNER instances init --instance ${TEMPLATE_NAME} --template ${TEMPLATE_NAME}
 $VINTNER instances resolve --instance ${TEMPLATE_NAME} --presets ${DEPLOYMENT_VARIANT}
 $VINTNER instances validate --instance ${TEMPLATE_NAME}  --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml
-# $VINTNER instances deploy --instance ${TEMPLATE_NAME} --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml
+$VINTNER instances deploy --instance ${TEMPLATE_NAME} --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml

examples/unfurl-aware/scripts/configuration.env

@@ -1,3 +1,3 @@
 TEMPLATE_NAME="aware"
 VINTNER="node ../../../build/cli/index.js"
-DEPLOYMENT_VARIANT="cloud"
+DEPLOYMENT_VARIANT="local"

examples/unfurl-aware/scripts/setup.sh

@@ -5,6 +5,6 @@ set -e
 source configuration.sh
 
 $VINTNER setup init
-$VINTNER orchestrators init unfurl --no-venv
+$VINTNER orchestrators init unfurl
 $VINTNER orchestrators enable --orchestrator unfurl
 $VINTNER orchestrators attest --orchestrator unfurl

examples/xopera-motivation/lib/openstack/vm/playbooks/create.yaml

@@ -39,15 +39,15 @@
       - name: Set attributes
         set_stats:
             data:
-                private_address: '{{ server_info.server.private_v4 }}'
-                public_address: '{{ server_info.server.public_v4 }}'
+                private_address: '{{ server_info.server.addresses[network][0].addr }}'
+                public_address: '{{ server_info.server.addresses[network][0].addr }}'
                 id: '{{ server_info.server.id }}'
 
       - name: Create temporary inventory for ssh wait
         add_host:
             name: server
             groups: vms
-            ansible_host: '{{ server_info.server.public_v4 }}'
+            ansible_host: '{{ server_info.server.addresses[network][0].addr }}'
             ansible_user: '{{ ssh_user }}'
             ansible_ssh_private_key_file: '{{ ssh_key_file }}'
             ansible_ssh_common_args: >

examples/xopera-motivation/scripts/clean.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Clean
+$VINTNER setup clean --force

examples/xopera-motivation/scripts/code.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Open VS Code
+$VINTNER instances code --instance ${TEMPLATE_NAME}

examples/xopera-motivation/scripts/configuration.env

@@ -0,0 +1,5 @@
+TEMPLATE_NAME="xopera-motivation"
+VINTNER="node ../../../build/cli/index.js"
+#VINTNER="../../../task vintner"
+ORCHESTRATOR="xopera"
+VARIANT="dev"

examples/xopera-motivation/scripts/configuration.sh

@@ -0,0 +1,36 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.env
+
+# Check that TEMPLATE_NAME is defined
+if [[ -z ${TEMPLATE_NAME} ]]; then
+    echo "TEMPLATE_NAME is not defined"
+    exit 1
+fi
+
+# Check that VINTNER is defined
+if [[ -z ${VINTNER} ]]; then
+    echo "VINTNER is not defined"
+    exit 1
+fi
+
+
+# Check that VARIANT is defined
+if [[ -z ${VARIANT} ]]; then
+    echo "VARIANT is not defined"
+    exit 1
+fi
+
+# Check that ORCHESTRATOR is defined
+if [[ -z ${ORCHESTRATOR} ]]; then
+    echo "ORCHESTRATOR is not defined"
+    exit 1
+fi
+
+# Set template directory
+TEMPLATE_DIR=$(readlink -f $(dirname $0)/../)

examples/xopera-motivation/scripts/continue.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Continue deployment
+$VINTNER instances continue --instance ${TEMPLATE_NAME} --force

examples/xopera-motivation/scripts/deploy.sh

@@ -0,0 +1,15 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+$VINTNER template pull --dir ${TEMPLATE_DIR}
+$VINTNER templates import --template ${TEMPLATE_NAME} --path ${TEMPLATE_DIR}
+$VINTNER instances init --instance ${TEMPLATE_NAME} --template ${TEMPLATE_NAME}
+$VINTNER instances resolve --instance ${TEMPLATE_NAME} --presets ${VARIANT}
+$VINTNER instances validate --instance ${TEMPLATE_NAME} --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml
+$VINTNER instances deploy --instance ${TEMPLATE_NAME} --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml

examples/xopera-motivation/scripts/enrich.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Load configuration
+source configuration.sh
+
+# Enrich
+$VINTNER template enrich --template ${TEMPLATE_DIR}/variable-service-template.yaml --output ${TEMPLATE_DIR}/enriched.yaml

examples/xopera-motivation/scripts/pull.sh

@@ -0,0 +1,9 @@
+#! /usr/bin/bash
+set -e
+
+# Load configuration
+source configuration.sh
+
+# Pull dependencies
+$VINTNER template pull --dir ${TEMPLATE_DIR}
+

examples/xopera-motivation/scripts/quality.sh

@@ -0,0 +1,13 @@
+#! /usr/bin/bash
+set -e
+
+# Load configuration
+source configuration.sh
+
+# Quality
+for dir in ../tests/*/;
+#for dir in "../tests/gcp";
+do
+  dir=$(basename $dir)
+  echo "${dir}: $($VINTNER template quality --template ${TEMPLATE_DIR}/variable-service-template.yaml --inputs ${TEMPLATE_DIR}/tests/${dir}/inputs.yaml)"
+done

examples/xopera-motivation/scripts/reimport.sh

@@ -0,0 +1,20 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+$VINTNER instances undeploy --instance ${TEMPLATE_NAME} || true
+
+$VINTNER instances delete --instance ${TEMPLATE_NAME} --force || true
+$VINTNER templates delete --template ${TEMPLATE_NAME} || true
+
+$VINTNER template pull --dir ${TEMPLATE_DIR}
+$VINTNER templates import --template ${TEMPLATE_NAME}  --path ${TEMPLATE_DIR}
+$VINTNER instances init --instance ${TEMPLATE_NAME}  --template ${TEMPLATE_NAME}
+$VINTNER instances resolve --instance ${TEMPLATE_NAME} --presets ${VARIANT}
+$VINTNER instances validate --instance ${TEMPLATE_NAME} --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml
+$VINTNER instances deploy --instance ${TEMPLATE_NAME}  --inputs ${TEMPLATE_DIR}/deployment-inputs.ignored.yaml

examples/xopera-motivation/scripts/setup.sh

@@ -0,0 +1,14 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Setup
+$VINTNER setup init
+$VINTNER orchestrators init ${ORCHESTRATOR}
+$VINTNER orchestrators enable --orchestrator ${ORCHESTRATOR}
+$VINTNER orchestrators attest --orchestrator ${ORCHESTRATOR}

examples/xopera-motivation/scripts/swap-lib.sh

@@ -0,0 +1,16 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+FS="/c/Users"
+if [[ "${OSTYPE}" == "linux-gnu" ]]; then
+  FS="/home"
+fi
+
+# Delete lib in instance
+rm -rf ${FS}/stoetzms/.opentosca_vintner/instances/technology-gcp/data/ensemble/lib
+
+# Copy local lib into instance
+cp -R ../lib ${FS}/stoetzms/.opentosca_vintner/instances/technology-gcp/data/ensemble

examples/xopera-motivation/scripts/undeploy.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Undeploy application
+$VINTNER instances undeploy --instance ${TEMPLATE_NAME}

examples/xopera-pruning-consistent-loose/scripts/configuration.env

@@ -1,3 +1,3 @@
 TEMPLATE_NAME="consistent-loose"
-VINTNER="task cli --"
+VINTNER="node ../../../build/cli/index.js"
 VARIABILITY_PRESET="static"

examples/xopera-pruning-consistent-loose/scripts/setup.sh

@@ -5,6 +5,6 @@ set -e
 source configuration.sh
 
 $VINTNER setup init
-$VINTNER orchestrators init xopera --no-venv
+$VINTNER orchestrators init xopera
 $VINTNER orchestrators enable --orchestrator xopera
 $VINTNER orchestrators attest --orchestrator xopera

examples/xopera-pruning/scripts/clean.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Clean
+$VINTNER setup clean --force

examples/xopera-pruning/scripts/code.sh

@@ -0,0 +1,11 @@
+#! /usr/bin/bash
+set -e
+
+# Set working directory
+cd "$(dirname "$0")"
+
+# Load configuration
+source configuration.sh
+
+# Open VS Code
+$VINTNER instances code --instance ${TEMPLATE_NAME}

examples/xopera-pruning/scripts/configuration.env

@@ -0,0 +1,5 @@
+TEMPLATE_NAME="xopera-pruning"
+VINTNER="node ../../../build/cli/index.js"
+#VINTNER="../../../task vintner"
+ORCHESTRATOR="xopera"
+VARIANT="static"