omf_ec 6.1.9 → 6.1.10

data/lib/omf_ec/backward/dsl.rb

@@ -20,6 +20,7 @@ module OmfEc
           v5_style(:loadOEDL, base)
           v5_style(:ensureProperty, base)
           v5_style(:defQuery, base)
+          v5_style(:getResources, base)
         end
 
         def v5_style(name, base)

data/lib/omf_ec/dsl.rb

@@ -10,6 +10,8 @@ require 'eventmachine'
 require 'uri'
 require 'open-uri'
 require 'tempfile'
+require 'json'
+require 'net/http'
 
 module OmfEc
   # DSL methods to be used for OEDL scripts
@@ -338,8 +340,6 @@ module OmfEc
     #
     def def_query(query)
       raise "No valid URL to connect to the Job Service!" if OmfEc.experiment.job_url.nil?
-      require 'json'
-      require 'net/http'
       begin
         query = query.sql if query.kind_of? OmfEc::Graph::MSBuilder
         # Create a Measurement Point for that Job item
@@ -359,11 +359,11 @@ module OmfEc
         u = URI.parse(OmfEc.experiment.job_mps[query]+'/data')
         res = Net::HTTP.get(u)
         raise "No valid data from the service providing measurements" if res.nil? || res.empty? || !(res.kind_of? String)
-        resjon = JSON.parse(res)
-        metrics = resjon['schema'].map { |e| e[0] }
+        resjson = JSON.parse(res)
+        metrics = resjson['schema'].map { |e| e[0] }
         data = []
-        resjon['data'].each do |a|
-          row = {}
+        resjson['data'].each do |a|
+          row = Hashie::Mash.new
           a.each_index { |i| row[metrics[i].downcase.to_sym] = a[i] }
           data << row
         end
@@ -371,7 +371,7 @@ module OmfEc
       rescue Exception => ex
         return nil if ex.kind_of? EOFError
         error "def_query - #{ex} (#{ex.class})"
-        error "def_query - #{ex.backtrace.join("\n\t")}"
+        #error "def_query - #{ex.backtrace.join("\n\t")}"
         return nil
       end
     end
@@ -396,5 +396,27 @@ module OmfEc
       msb
     end
 
+    # Query a Slice Service to get back the list of resources which were 
+    # previously provisioned for the slice within which this EC is operating.
+    # Return either an empty array or an array of Hash (actually Hashie::Mash)
+    # Require that the EC was provided an URL to a slice service (option
+    # --slice-service) and the name of the slice (option --slice).
+    #
+    def get_resources
+      begin
+        #slice_url = "http://bleeding.mytestbed.net:8006/slices/"
+        raise "No slice service URL, use '--slice-service' option" if OmfEc.experiment.ss_url.nil?
+        raise "No slice name, use '--slice' option" if OmfEc.experiment.sliceID.nil?
+        u = URI.parse(OmfEc.experiment.ss_url+'/'+OmfEc.experiment.sliceID+'/resources')
+        res = Net::HTTP.get(u)
+        raise "Could not retrieve a valid list of resources from '#{u}'" if res.nil? || res.empty? || !(res.kind_of? String)
+        Hashie::Mash.new(JSON.parse(res)).values
+      rescue Exception => ex
+        error "get_resources - #{ex} (#{ex.class}) - URI: '#{u}'"
+        #error "get_resources - #{ex.backtrace.join("\n\t")}"
+        return []
+      end
+    end
+
   end
 end

data/lib/omf_ec/experiment.rb

@@ -16,7 +16,7 @@ module OmfEc
 
     include MonitorMixin
 
-    attr_accessor :name, :sliceID, :oml_uri, :js_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
+    attr_accessor :name, :sliceID, :oml_uri, :js_url, :ss_url, :job_url, :job_mps, :app_definitions, :property, :cmdline_properties, :show_graph, :nodes
     attr_reader :groups, :sub_groups, :state
 
     # MP only used for injecting metadata
@@ -44,6 +44,7 @@ module OmfEc
       @js_url = nil
       @job_url = nil
       @job_mps = {}
+      @ss_url = nil
     end
 
     def property

data/lib/omf_ec/runner.rb

@@ -113,6 +113,11 @@ module OmfEc
             remove_cmd_opts_from_argv("--job-url", url)
           end
 
+          op.on("--slice-service URL", "URL to the SliceService [optional]") do |url|
+            OmfEc.experiment.ss_url = url
+            remove_cmd_opts_from_argv("--slice-service", url)
+          end
+
           op.on("--oml_uri URI", "URI for the OML data collection of experiment applications") do |uri|
             @cmd_opts[:oml_uri] = uri
             remove_cmd_opts_from_argv("--oml_uri", uri)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.9
+  version: 6.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9
+        version: 6.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.9
+        version: 6.1.10
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4325778270689122680
+      hash: -2796515617465100587
 requirements: []
 rubyforge_project: omf_ec
 rubygems_version: 1.8.23