Merge remote-tracking branch 'upstream/master'

Author: Italtel-Unimi

README.md

@@ -92,7 +92,7 @@ The PoP information is saved in Gatekeeper. This can be inserted in three manner
  First of all, define the following variables:
 
 ```
- GATEKEEPER_IP=localhost
+ GATEKEEPER_HOST=localhost:8000
  GATEKEEPER_PASS=Eq7K8h9gpg
  GATEKEEPER_USER_ID=1
  OPENSTACK_IP=localhost
@@ -104,12 +104,12 @@ The PoP information is saved in Gatekeeper. This can be inserted in three manner
  Get the Gatekeeper token (you can copy and paste in the command prompt):
 
 ```
-tokenId=$(curl -XPOST http://$GATEKEEPER_IP:8000/token/ -H "X-Auth-Password:$GATEKEEPER_PASS" -H "X-Auth-Uid:$GATEKEEPER_USER_ID" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["token"]["id"]')
+tokenId=$(curl -XPOST http://$GATEKEEPER_HOST/token/ -H "X-Auth-Password:$GATEKEEPER_PASS" -H "X-Auth-Uid:$GATEKEEPER_USER_ID" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["token"]["id"]')
 ```
 
 Post PoP Information (you can copy and paste in the command prompt):
 ```
- curl -X POST http://$GATEKEEPER_IP:8000/admin/dc/ \
+ curl -X POST http://$GATEKEEPER_HOST/admin/dc/ \
    -H 'X-Auth-Token: '$tokenId'' \
    -d '{"msg": "PoP Testbed", "dcname":"default", "adminid":"'$keystoneUser'","password":"'$keystonePass'", "extrainfo":"pop-ip='$OPENSTACK_IP' tenant-name='$admin_tenant_name' keystone-endpoint=http://'$OPENSTACK_IP':35357/v2.0 orch-endpoint=http://'$OPENSTACK_IP':8004/v1 compute-endpoint=http://'$OPENSTACK_IP':8774/v2.1 neutron-endpoint=http://'$OPENSTACK_IP':9696/v2.0"}'
 ```

dependencies/install_cassandra.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+cassandra_version="3.7"
+logstash_version="2.4.0"
+elasticsearch_version="2.4.0"
+
+echo "input {
+  stdin{}
+  tcp {
+    port => 9999
+    codec => json_lines
+  }
+  udp {
+    port => 5229
+    codec => json_lines
+  }
+}
+output {
+  elasticsearch {
+	host => localhost
+	protocol => http
+  }
+  stdout { codec => rubydebug }
+}
+" > logstash.conf
+
+
+echo "Installing Java..."
+sudo apt-add-repository ppa:webupd8team/java
+sudo apt-get update
+sudo apt-get install oracle-java8-installer
+
+echo "Installing Cassandra"
+
+wget http://mirrors.fe.up.pt/pub/apache/cassandra/$cassandra_version/apache-cassandra-$cassandra_version-bin.tar.gz
+tar -zxvf apache-cassandra-$cassandra_version-bin.tar.gz
+rm apache-cassandra-$cassandra_version-bin.tar.gz
+
+ip_address=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1  -d'/')
+#edit config file
+sed -i -e 's/\(start_rpc:\).*/\1 true/' apache-cassandra-$cassandra_version/conf/cassandra.yaml
+sed -i -e 's/\(rpc_address:\).*/\1 '$ip_address'/' apache-cassandra-$cassandra_version/conf/cassandra.yaml
+#start_rpc: true  => line 445
+#rpc_address: 172.16.6.29 => line 475
+#nano apache-cassandra-2.2.4/conf/cassandra.yaml
+
+#load schema
+#apache-cassandra-2.2.4/bin/cqlsh localhost 9042 -f ns_schema.txt
+
+#start cassandra
+#apache-cassandra-2.2.4/bin/cassandra
+
+echo "Installation of Cassandra done. Start with the command: apache-cassandra-$cassandra_version/bin/cassandra -f."
+
+echo "And remember to load the Schema with: apache-cassandra-$cassandra_version/bin/cqlsh localhost 9042 -f db/schema.txt"
+
+echo "Installing logstash"
+
+wget https://download.elastic.co/logstash/logstash/logstash-$logstash_version.tar.gz
+tar -zxvf logstash-$logstash_version.tar.gz
+rm logstash-$logstash_version.tar.gz
+
+echo "Installation of Logstash done. Start with the command: logstash-$logstash_version/bin/bin/logstash agent -f logstash.conf."
+
+
+echo "Installing elasticsearch"
+
+wget https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/$elasticsearch_version/elasticsearch-$elasticsearch_version.tar.gz
+tar -zxvf elasticsearch-$elasticsearch_version.tar.gz
+rm elasticsearch-$elasticsearch_version.tar.gz
+
+echo "Installation of ElasticSearch done. Start with the command: elasticsearch-$elasticsearch_version/bin/elasticsearch."

dependencies/install_dependencies.sh

@@ -30,10 +30,6 @@ function echo_pass {
   echo -e "\033[0m"
 }
 
-# echo pass or fail
-# example
-# echo echo_if 1 "Passed"
-# echo echo_if 0 "Failed"
 function echo_if {
   if [ $1 == 1 ]; then
     echo_pass $2
@@ -42,6 +38,18 @@ function echo_if {
   fi
 }
 
+function install_rabbitmq {
+    echo "Installing RabbitMq..."
+    wget https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server-generic-unix-3.6.5.tar.xz
+
+    echo 'deb http://www.rabbitmq.com/debian/ testing main' | sudo tee /etc/apt/sources.list.d/rabbitmq.list
+    wget -O- https://www.rabbitmq.com/rabbitmq-release-signing-key.asc | sudo apt-key add -
+    sudo apt-get update
+    sudo apt-get install rabbitmq-server
+
+    echo "Restarting RabbitMq service"
+    sudo service rabbitmq-server restart
+}
 function install_mongodb {
     echo "Installing mongodb..."
     ./install_mongodb.sh
@@ -53,6 +61,7 @@ function install_gatekeeper {
 function install_ruby {
     echo "Installing RVM..."
     gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+	curl -sSL https://rvm.io/mpapis.asc | gpg --import -
     \curl -sSL https://get.rvm.io | bash -s stable
     echo "Installation of RVM done."
 
@@ -74,36 +83,34 @@ function install_npm {
 
     echo "Installing Grunt and Bower..."
     cd ../ui
-    pwd
-    sudo npm install -g grunt grunt-cli bower
-    echo "Installation of Grunt and Bower done."
+	echo "You need to install manually Grunt and Grunt-cli"
+#    sudo npm install -g grunt grunt-cli bower
+#    echo "Installation of Grunt and Bower done."
 
-    sudo npm install
+#    sudo npm install
 
     echo "Installing Compass..."
     gem install compass
     echo "Installation of Compass done."
 
     cd ../dependencies
     echo "NPM dependencies done."
-
+	echo "You need to move it to UI folder, and t install manually Grunt and Grunt-cli with the command: sudo npm install -g grunt grunt-cli bower"
+	echo "Also, then use the following command: sudo npm install"
 }
 
 echo -e -n "\033[1;36mChecking if mongodb is installed"
 mongod --version > /dev/null 2>&1
 MONGO_IS_INSTALLED=$?
 if [ $MONGO_IS_INSTALLED -eq 0 ]; then
     echo ">>> MongoDB already installed"
-    #service mongod restart
 else
     echo "Do you want to install mongodb? (y/n)"
     read install
     if [ "$install" = "y" ]; then
       echo -e -n "\033[1;31mMongodb is not installed... Installing..."
       install_mongodb
     fi
-    #./install_mongodb.sh
-    #bash -c "$(curl -fsSL https://raw.githubusercontent.com/steveneaston/Vaprobash/master/scripts/mongodb.sh)" bash $1 $2
 fi
 
 echo -e -n "\033[1;36mChecking if gatekeeper is installed"
@@ -158,9 +165,24 @@ else
     fi
 fi
 
+echo -e -n "\033[1;36mChecking if rabbitmq is installed"
+rabbitmq-server --version > /dev/null 2>&1
+RABBITMQ_IS_INSTALLED=$?
+if [ $RABBITMQ_IS_INSTALLED -eq 0 ]; then
+    echo ">>> RabbitMQ already installed"
+else
+    echo "Do you want to install rabbitmq for monitoring? (y/n)"
+    read install
+    if [ "$install" = "y" ]; then
+      echo -e -n "\033[1;31mRabbitmq is not installed... Installing..."
+      install_rabbitmq
+    fi
+fi
+
 echo -e -n "\033[1;36mChecking if dependencies are installed\n"
 echo "mongod          $(echo_if $(program_is_installed mongo))"
 echo "ruby            $(echo_if $(program_is_installed ruby))"
 echo "bundler         $(echo_if $(program_is_installed bundler))"
 echo "node            $(echo_if $(program_is_installed node))"
 echo "npm             $(echo_if $(program_is_installed npm))"
+echo "rabbitmq             $(echo_if $(program_is_installed rabbitmq-server))"

dependencies/install_gatekeeper.sh

@@ -19,7 +19,7 @@ echo "Downloading auth-utils code now, please wait ..."
 mkdir $HOME/go
 mkdir -p $HOME/go/src/github.com/piyush82
 cd $HOME/go/src/github.com/piyush82
-git clone https://github.com/piyush82/auth-utils.git
+git clone https://github.com/T-NOVA/auth-utils
 echo "done."
 
 cd auth-utils

hot-generator/routes/hot.rb

@@ -40,8 +40,9 @@ class HotGenerator < Sinatra::Application
 		routers_id = provision_info['routers_id']
 		halt 400, 'Routers ID not found' if routers_id.nil?
 
-		security_group_id = provision_info['security_group_id']
-		halt 400, 'Security group ID not found' if security_group_id.nil?
+		if provision_info['security_group_id'].nil?
+			security_group_id = nil
+		end
 
 		vnfr_id = provision_info['vnfr_id']
 		halt 400, 'Vnfr ID not found' if vnfr_id.nil?
@@ -146,4 +147,4 @@ class HotGenerator < Sinatra::Application
     File.read(File.join('assets/templates', params[:file_name]))
 	end
 
-end
+end

invoker.ini

@@ -14,6 +14,14 @@ command = rake start
 directory = ./ns-provisioning
 command = rake start
 
+[ns-monitoring]
+directory = ./ns-monitoring
+command = rake start
+
+[ns-monitoring-repository]
+directory = ./ns-monitoring-repository
+command = rake start
+
 [vnf-catalogue]
 directory = ./vnf-catalogue
 command = rake start
@@ -30,6 +38,14 @@ command = rake start
 directory = ./vnfd-validator
 command = rake start
 
+[vnf-monitoring]
+directory = ./vnf-monitoring
+command = rake start
+
+[vnf-monitoring-repository]
+directory = ./vnf-monitoring-repository
+command = rake start
+
 [hot-generator]
 directory = ./hot-generator
 command = rake start

ns-provisioning/helpers/vim.rb

@@ -199,6 +199,9 @@ def createSecurityGroup(computeUrl, tenant_id, token)
       logger.error e.response.body
     end
     sec, error = parse_json(response)
+    if sec.nil?
+      return nil
+    end
     return sec['security_group']['id']
   end
 
@@ -238,13 +241,17 @@ def getSecurityGroups(computeUrl, tenant_id, token)
     rescue => e
       logger.error e
       logger.error e.response.body
+      return nil
     end
     sec, error = parse_json(response)
     return sec
   end
 
   def configureSecurityGroups(computeUrl, tenant_id, token)
     vim_security_groups = getSecurityGroups(computeUrl, tenant_id, token)
+    if vim_security_groups
+      return nil
+    end
     security_group_id = nil
     if (!settings.default_tenant_name.nil?)
       security_group_id = vim_security_groups['security_groups'][0]['id']

tenor_install.sh

@@ -5,6 +5,7 @@ declare mongo_ip
 declare gatekeeper
 declare dns
 declare logstash_address
+declare cassandra_address
 
 pause(){
   read -p "Press [Enter] key to continue..." fackEnterKey
@@ -105,6 +106,7 @@ configureIps(){
     GATEKEEPER="127.0.0.1:8000"
     DNS_SERVER="8.8.8.8"
     LOGSTASH_ADDRESS="127.0.0.1:5228"
+    CASSANDRA_ADDRESS="127.0.0.1"
 
     echo "Type the IP where is installed TeNOR, followed by [ENTER]:"
     read tenor_ip
@@ -126,6 +128,10 @@ configureIps(){
     read logstash_address
     if [ -z "$logstash_address" ]; then logstash_address=$LOGSTASH_ADDRESS; fi
 
+    echo "Type the IP (xxx.xxx.xxx.xxx) where is installed Cassandra, followed by [ENTER]:"
+    read cassandra_address
+    if [ -z "$cassandra_address" ]; then cassandra_address=$CASSANDRA_ADDRESS; fi
+
     logstash_host=${logstash_address%%:*}
     logstash_port=${logstash_address##*:}
 }
@@ -169,6 +175,7 @@ configureFiles(){
         if [ -f config/database.yml.sample ] &&  [ ! -f config/database.yml ]; then
             printf "Copy Cassandra Config\n"
             cp config/database.yml.sample config/database.yml
+            sed -i -e 's/127.0.0.1:27017/'$cassandra_address'/' config/database.yml
         fi
         cd ../
     done
@@ -185,6 +192,7 @@ addNewPop(){
     GATEKEEPER_HOST=localhost:8000
     GATEKEEPER_PASS=Eq7K8h9gpg
     GATEKEEPER_USER_ID=1
+    OPENSTACK_NAME=default
     OPENSTACK_IP=localhost
     ADMIN_TENANT_NAME=admin
     KEYSTONEPASS=password
@@ -194,6 +202,10 @@ addNewPop(){
     read gatekeeper_host
     if [ -z "$gatekeeper_host" ]; then gatekeeper_host=$GATEKEEPER_HOST; fi
 
+    echo "Type the Openstack name, followed by [ENTER]:"
+    read openstack_name
+    if [ -z "$openstack_name" ]; then openstack_name=$OPENSTACK_NAME; fi
+
     echo "Type the Openstack IP, followed by [ENTER]:"
     read openstack_ip
     if [ -z "$openstack_ip" ]; then openstack_ip=$OPENSTACK_IP; fi
@@ -213,7 +225,7 @@ addNewPop(){
     tokenId=$(curl -XPOST http://$gatekeeper_host/token/ -H "X-Auth-Password:$GATEKEEPER_PASS" -H "X-Auth-Uid:$GATEKEEPER_USER_ID" | python -c 'import json,sys;obj=json.load(sys.stdin);print obj["token"]["id"]')
     curl -X POST http://$gatekeeper_host/admin/dc/ \
     -H 'X-Auth-Token: '$tokenId'' \
-    -d '{"msg": "PoP Testbed", "dcname":"default", "adminid":"'$keystoneUser'","password":"'$keystonePass'", "extrainfo":"pop-ip='$openstack_ip' tenant-name='$admin_tenant_name' keystone-endpoint=http://'$openstack_ip':35357/v2.0 orch-endpoint=http://'$openstack_ip':8004/v1 compute-endpoint=http://'$openstack_ip':8774/v2.1 neutron-endpoint=http://'$openstack_ip':9696/v2.0"}'
+    -d '{"msg": "PoP Testbed", "dcname":"'$openstack_name'", "adminid":"'$keystoneUser'","password":"'$keystonePass'", "extrainfo":"pop-ip='$openstack_ip' tenant-name='$admin_tenant_name' keystone-endpoint=http://'$openstack_ip':35357/v2.0 orch-endpoint=http://'$openstack_ip':8004/v1 compute-endpoint=http://'$openstack_ip':8774/v2.1 neutron-endpoint=http://'$openstack_ip':9696/v2.0"}'
 
     pause
 }

vnf-manager/routes/configs.rb

@@ -103,11 +103,11 @@ class ServiceConfiguration < VNFManager
 	post '/services/publish/:microservice' do
 		name =  params[:microservice]
 
-		registerService(request.body.read)
+		#registerService(request.body.read)
 
-		EM.defer do
-			ServiceConfigurationHelper.publishServices()
-		end
+		#EM.defer do
+		#	ServiceConfigurationHelper.publishServices()
+		#end
 
 		return 200
 	end

vnfd-validator/assets/samples/vnfd_example.json

@@ -169,7 +169,6 @@
           "vdu0"
         ],
         "external_access": true,
-        "port_security_enabled": false,
         "connection_points_reference": [
           "CPfs0h"
         ],
@@ -187,7 +186,6 @@
           "vdu0"
         ],
         "external_access": true,
-        "port_security_enabled": false,
         "connection_points_reference": [
           "CPng8r"
         ],