Sync Integ to Master

Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>

4 files changed, 0 insertions, 113 deletions

diff --git a/asdc-tests/src/test/resources/CI/components/apache/apache-type.yml b/asdc-tests/src/test/resources/CI/components/apache/apache-type.yml
deleted file mode 100644
index 360b1a2d60..0000000000
--- a/asdc-tests/src/test/resources/CI/components/apache/apache-type.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0_wd03
-description: TOSCA simple profile with Apache.
-template_name: apache-type
-template_version: 2.0.0-SNAPSHOT
-template_author: FastConnect
-
-imports:
-  - "tosca-normative-types-root:1.0.0.wd03-SNAPSHOT"
-  - "tosca-normative-types-webServer:1.0.0.wd03-SNAPSHOT"
-
-node_types:
-  alien.nodes.Apache:
-    derived_from: tosca.nodes.WebServer
-    description: >
-      The TOSCA Apache Node Type represents an apache component
-      that can be managed and run by a TOSCA Compute Node Type.
-    capabilities:
-      host:
-        type: alien.capabilities.ApacheContainer
-        properties:
-          valid_node_types: [ tosca.nodes.WebApplication ]
-    tags:
-      icon: /images/apache.png
-    properties:
-      version:
-        type: version
-        default: 2.4
-        constraints:
-          - equal: 2.4
-      port:
-        type: integer
-        description: Port for the Apache server
-        default: 80
-        constraints:
-          - greater_or_equal: 1
-      document_root:
-          type: string
-          default: "/var/www"
-    interfaces:
-      Standard:
-        create:
-          inputs:
-            PORT: { get_property: [SELF, port] }
-            DOC_ROOT: { get_property: [SELF, document_root] }
-          implementation: scripts/install_apache.sh
-        start: scripts/start_apache.sh
-
-capability_types:
-  alien.capabilities.ApacheContainer:
-      derived_from: tosca.capabilities.Container
diff --git a/asdc-tests/src/test/resources/CI/components/apache/images/apache.png b/asdc-tests/src/test/resources/CI/components/apache/images/apache.png
deleted file mode 100644
index 8e9f402d90..0000000000
--- a/asdc-tests/src/test/resources/CI/components/apache/images/apache.png
+++ /dev/null
diff --git a/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh b/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh
deleted file mode 100644
index a77f9a13f8..0000000000
--- a/asdc-tests/src/test/resources/CI/components/apache/scripts/install_apache.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-echo "Using apt-get. Installing apache2 on one of the following : Debian, Ubuntu, Mint"
-LOCK="/tmp/lockaptget"
-DEFAULT_PORT=80
-
-while true; do
-  if mkdir "${LOCK}" &>/dev/null; then
-    echo "Apache take the lock"
-    break;
-  fi
-  echo "Waiting the end of one of our recipes..."
-  sleep 0.5
-done
-
-while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-  echo "Waiting for other software managers to finish..."
-  sleep 0.5
-done
-
-sudo rm -f /var/lib/dpkg/lock
-sudo apt-get update || (sleep 15; sudo apt-get update || exit ${1})
-sudo apt-get install -y -q apache2 || exit ${1}
-rm -rf "${LOCK}"
-
-sudo /etc/init.d/apache2 stop
-if [ ! -d $DOC_ROOT ]; then
-  eval "sudo mkdir -p $DOC_ROOT"
-fi
-eval "sudo chown -R www-data:www-data $DOC_ROOT"
-
-if [[ ("$PORT" == "$DEFAULT_PORT") ]]; then
-  echo "Use default port for Apache : $DEFAULT_PORT"
-else
-  echo "Replacing port $DEFAULT_PORT with $PORT..."
-  sudo sed -i -e "s/$DEFAULT_PORT/$PORT/g" /etc/apache2/ports.conf || exit ${1}
-fi
-
-echo "Change config of apache2"
-if sudo test -f "/etc/apache2/sites-available/default"; then
-  echo "Change the DocumentRoot of apache2 on Ubuntu < 14.04"
-  sudo sed -i -e "s#DocumentRoot /var/www#DocumentRoot $DOC_ROOT#g" /etc/apache2/sites-available/default
-fi
-if sudo test -f "/etc/apache2/sites-available/000-default.conf"; then
-  echo "Change the DocumentRoot of Apache2 on Ubuntu >= 14.04"
-  sudo sed -i -e "s#DocumentRoot /var/www/html#DocumentRoot $DOC_ROOT#g" /etc/apache2/sites-available/000-default.conf
-fi
-
-sudo bash -c "echo ServerName localhost >> /etc/apache2/apache2.conf"
-
-echo "Start apache2 whith new conf"
-sudo /etc/init.d/apache2 start
-echo "End of $0"
diff --git a/asdc-tests/src/test/resources/CI/components/apache/scripts/start_apache.sh b/asdc-tests/src/test/resources/CI/components/apache/scripts/start_apache.sh
deleted file mode 100644
index 478c56edf5..0000000000
--- a/asdc-tests/src/test/resources/CI/components/apache/scripts/start_apache.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-service="apache2"
-
-if (( $(ps -ef | grep -v grep | grep $service | wc -l) > 0 ))
-then
-  sudo /etc/init.d/$service restart
-else
-  sudo /etc/init.d/$service start
-fi