Merge pull request #131 from jbatalle/master

v0.9.0

.codeclimate.yml

@@ -0,0 +1,4 @@
+exclude_paths:
+- "**/doc"
+- "ui/app/bower_components"
+- "**/.yardoc"

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.9.0
+- Refactor. Removed unused files and functions.
+- Hide credentials from logs.
+- Implemented missing WICM calls.
+- UI VNFD JSON editor.
+- UI included progress bar in instance status
+- Calculation of creation time of each resource in a stack. Saved in the VNFR.
+- Updated Dockerfile and Vagrant according last updates.
+
 ## 0.8.0
 - Changed authentication method. No external entity is required for authentication.
 - Authentication between modules enabled when environment is production using JWT.

Dockerfile

@@ -35,14 +35,15 @@ WORKDIR /root
 RUN apt-get -q -y install curl
 
 # Clone the conf files into the docker container
-RUN git clone https://github.com/jbatalle/TeNOR /root/TeNOR
+RUN git clone https://github.com/T-NOVA/TeNOR /root/TeNOR
 
 ENV RAILS_ENV development
 WORKDIR /root/TeNOR
 RUN bundle --version
 RUN cat Gemfile
 RUN gem install bundle
 RUN bundle install
+RUN sed -i 's/rake db:seed/bundle exec rake db:seed/g' tenor_install.sh
 RUN ./tenor_install.sh 1
 
 RUN chown -R mongodb:mongodb /var/lib/mongodb

Vagrantfile

@@ -11,8 +11,7 @@ Vagrant.configure(2) do |config|
         vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']
     end
 
-    # config.vm.network :forwarded_port, guest: 4000, host: 4000 # tenor port
-    config.vm.network :forwarded_port, guest: 8000, host: 8000 # gatekeeper port
+    config.vm.network :forwarded_port, guest: 4000, host: 4000 # tenor port
     config.vm.network :forwarded_port, guest: 9000, host: 9000 # tenor UI port
     config.vm.network :forwarded_port, guest: 27017, host: 27017 # tenor UI port
 
@@ -36,7 +35,7 @@ Vagrant.configure(2) do |config|
     rvm group add rvm vagrant
     rvm fix-permissions
     cd ~
-    git clone https://github.com/TeNOR/TeNOR.git
+    git clone https://github.com/T-NOVA/TeNOR.git
     cd TeNOR/
     ./dependencies/install_dependencies.sh y y n
 

end_to_end.rb

@@ -13,7 +13,7 @@
 @OPENSTACK_DNS = ENV['OPENSTACK_DNS']
 
 if @OPENSTACK_HOST.nil?
-  puts "Execute the environment script! (. ./end_to_end_env.sh)"
+  puts "Execute the environment script! (. ./env_end_to_end.sh)"
   exit
 end
 
@@ -41,7 +41,7 @@ def end_to_end_script()
   puts "Removing PoPs if exists...."
   pops_names = ["admin_v2", "admin_v3", "non_admin_v2", "non_admin_v3"]
   pops_names.each do |pop|
-    remove_pops_if_exists(pop)
+    #remove_pops_if_exists(pop)
   end
 
   puts "All PoPs are removed\n"
@@ -121,6 +121,7 @@ def end_to_end_script()
     puts errors if errors
     recover_state(errors) if errors
     @e2e[:instances] << {:id => ns_instance_id, :status => "INIT"}
+    break
 	end
 	pop = @e2e[:pops].find { |p| p[:name] == "admin_v2"}
   #ns_instance, errors = create_instance(pop[:id])
@@ -150,7 +151,7 @@ def end_to_end_script()
         if @e2e[:instances].find {|ins| ins[:status] != "INSTANTIATED"}
           next
         else
-          puts "All instantiated???"
+          puts "All instances are INSTANTIATED"
           counter = 30
           break
         end
@@ -164,7 +165,7 @@ def end_to_end_script()
 
   puts "All instances created correctly..."
 
-  puts "Removing..."
+  puts "Start removing of instances..."
 
   @e2e[:instances].each do |instances|
 		delete_instance(instances[:id])
@@ -244,10 +245,12 @@ def check_if_descriptors(vnf_id, ns_id)
 def create_descriptors()
   puts "Creating descriptors"
 	vnfd = File.read('vnfd-validator/assets/samples/vnfd_example.json')
+  puts
 	begin
 		response = JSON.parse(RestClient.post "#{@tenor}/vnfs", vnfd, :content_type => :json)
   rescue RestClient::ExceptionWithResponse => e
     puts e
+    puts "Using the created VNFD"
     response = {'vnfd' => {}}
     response['vnfd']['id'] =  JSON.parse(vnfd)['vnfd']['id']
 	rescue => e
@@ -263,6 +266,11 @@ def create_descriptors()
 	nsd = File.read('nsd-validator/assets/samples/nsd_example.json')
 	begin
 		response = JSON.parse(RestClient.post "#{@tenor}/network-services", nsd, :content_type => :json)
+  rescue RestClient::ExceptionWithResponse => e
+    puts e
+    puts "Using the created NSD"
+    response = {'nsd' => {}}
+    response['nsd']['id'] =  JSON.parse(nsd)['nsd']['id']
 	rescue => e
 		puts "Error...."
 		puts e
@@ -293,8 +301,6 @@ def delete_descriptors()
 	end
 puts "Remving VNFD...."
 	if !@e2e[:vnfd_id].nil?
-    puts @e2e[:vnfd_id].to_s
-    puts "#{@tenor}/vnfs/" + @e2e[:vnfd_id].to_s
 		begin
 			response = RestClient.delete "#{@tenor}/vnfs/" + @e2e[:vnfd_id].to_s
 		rescue => e
@@ -351,7 +357,7 @@ def recover_state(error)
 	end
 
   @e2e[:instances].each do |instances|
-		delete_instance(instances)
+		delete_instance(instances[:id])
 	end
 
 	exit

hot-generator/config/config.yml.sample

@@ -9,7 +9,7 @@ timeout: 30
 max_persistent_conns: 512
 daemonize: false
 logger_host: 127.0.0.1
-logger_port: 5228
+logger_port: 24224
 port_security: false
 
 dependencies: []