NS Manager/Provisioning supports manual mapping of PoPs for each VNF. UI updated supporting it

Author: jbatalle

hot-generator/models/wicm_to_hot.rb

@@ -41,7 +41,7 @@ def build(provider_info)
     2.times {networks_name << create_network}
 
     # Create the subnets for all networks
-    networks_name.each_with_index {|name, index| create_subnet(name, 250 + index, ['8.8.8.8'])}
+    networks_name.each_with_index {|name, index| create_subnet(name, rand(256).to_s + '.' + rand(256).to_s + '.' + rand(256).to_s + '.0/24', ['8.8.8.8'])}
 
     # Create the Service Function Forwarder machine
     #create_server('image_name', create_flavor, create_ports(networks_name))
@@ -116,9 +116,9 @@ def create_network
   # @param [String] network_name the network name
   # @param [String] cidr the CIDR for the network
   # @return [String] the name of the created subnet
-  def create_subnet(network_name, index, dns_server)
+  def create_subnet(network_name, cidr, dns_server)
     name = get_resource_name
-    @hot.resources_list << Subnet.new(name, {get_resource: network_name}, dns_server, index)
+    @hot.resources_list << Subnet.new(name, {get_resource: network_name}, [dns_server], cidr)
     name
   end
 

ns-manager/helpers/statistics.rb

@@ -21,7 +21,7 @@ module StatisticsHelper
 
   # Update specific statistic
   #
-  # @param [Symbol] format the format type, `:text` or `:html`
+  # @param [string] name etric Name
   # @return [String] the object converted into the expected format.
   def updateStatistics(name)
     begin
@@ -36,7 +36,7 @@ def updateStatistics(name)
 
   # Get list of PoPs
   #
-  # @param [Symbol] format the format type, `:text` or `:html`
+  # @param [Hash] instance
   # @return [String] the object converted into the expected format.
   def savePerformance(instance)
 

ns-manager/routes/ns_provisioning.rb

@@ -48,7 +48,7 @@ class NsProvisioner < TnovaManager
 
     pop_list = []
     mapping_info = {}
-    if instantiation_info['pop_id'].nil?
+    if instantiation_info['pop_id'].nil? && instantiation_info['vnf_pop'].nil?
       available_pops = getDcs()
       if available_pops.empty?
         halt 400, "No PoPs registereds."
@@ -67,6 +67,10 @@ class NsProvisioner < TnovaManager
         #deploy to the unic PoP
         pop_list << getDc(available_pops[0]['id'])
       end
+    elsif !instantiation_info['vnf_pop'].nil?
+      instantiation_info['vnf_pop'].each_pair do |key, value|
+        pop_list << getDc(value)
+      end
     else
       #deploying the Instance into the requested PoP
       pop_list << getDc(instantiation_info['pop_id'])
@@ -83,7 +87,8 @@ class NsProvisioner < TnovaManager
         :flavour => instantiation_info['flavour'],
         :pop_list => pop_list,
         :mapping => mapping_info,
-        :infr_repo_url => infr_repo_url
+        :infr_repo_url => infr_repo_url,
+        :vnf_mapping => instantiation_info['vnf_pop']
       }
     begin
       response = RestClient.post provisioner.host + request.fullpath, provisioning.to_json, 'X-Auth-Token' => provisioner.token, :content_type => :json

ns-manager/routes/scaling.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 # @see NsScaling
-class NsScaling< TnovaManager
+class NsScaling < TnovaManager
 
   # @method post_ns_instances_scaling_out
   # @overload post "/ns-instances/scaling/:nsr_id/scale_out"
@@ -75,7 +75,7 @@ class NsScaling< TnovaManager
   # Autoscaling a Network service given a SLA breach in the monitoring
   # @param [string] nsr_id NS instance id
   post '/:nsr_id/auto_scale' do |nsr_id|
-    logger.debug "Request for AUTO SCALE"
+    logger.debug "#{nsr_id}: Request for AUTO SCALE"
 
     return 415 unless request.content_type == 'application/json'
 
@@ -98,7 +98,7 @@ class NsScaling< TnovaManager
       halt e.response.code, e.response.body
     end
 
-    logger.debug "Breach of parameter: " + auto_scale_info['parameter_id'].to_s
+    logger.debug "#{nsr_id}: Breach detected of parameter: #{auto_scale_info['parameter_id'].to_s}"
 
     flavour = nsr['service_deployment_flavour']
     halt 500, "Flavour not found for autoscale." if flavour.nil?
@@ -116,7 +116,7 @@ class NsScaling< TnovaManager
       halt 400, "No event defined for this scale request."
     end
 
-    logger.info "Breach detected in #{nsr_id}. Executing a #{event}"
+    logger.info "#{nsr_id}: Executing a #{event}"
 
     begin
       response = RestClient.post provisioner.host + "/ns-instances/scaling/#{nsr_id}/#{event}", "", 'X-Auth-Token' => provisioner.token, :content_type => :json
@@ -129,7 +129,7 @@ class NsScaling< TnovaManager
 
     updateStatistics('auto_scaling_request_executed')
 
-    logger.debug "AutoScaling executed."
+    logger.debug "#{nsr_id}: autoScaling executed."
     return response.code, response.body
   end
 

ns-provisioning/helpers/mapping.rb

@@ -76,4 +76,23 @@ def replace_pop_name_by_pop_id(mapping, pops)
         end
         mapping
     end
+
+    def getMappingResponseWithPops(mapping)
+        vnf_mapping = []
+        mapping.each_pair do |vnf_id, pop_id|
+            vnf_mapping << { 'maps_to_PoP' => "/pop/#{pop_id}", 'vnf' => '/' + vnf_id.to_s }
+        end
+
+        mapping = {
+            'links_mapping' =>
+            [
+                {
+                    'vld_id' => 'vld1',
+                    'maps_to_link' => '/pop/link/85b0bc34-dff0-4399-8435-4fb2ed65790a'
+                }
+            ],
+            'vnf_mapping' => vnf_mapping
+        }
+        mapping
+    end
 end