nitos_testbed_rc 1.0.2 → 2.0.0

data/bin/cm_proxy

@@ -82,7 +82,7 @@ class CmPDP
         return msg
       end
 
-      node = node[:resources].first
+      node = node[:resource]
 
       # if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
       #   debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
@@ -94,7 +94,7 @@ class CmPDP
       nod[:node_name] = node[:name]
       node[:interfaces].each do |i|
         if i[:role] == "control"
-          nod[:node_ip] = i[:ip][:address]
+          nod[:node_ip] = i[:ips].first[:address]
           nod[:node_mac] = i[:mac]
         elsif i[:role] == "cm_network"
           nod[:node_cm_ip] = i[:ip][:address]

data/bin/frisbee_proxy

@@ -86,7 +86,7 @@ class FrisbeePDP
           return msg
         end
 
-        node = node[:resources].first
+        node = node[:resource]
 
         # if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
         #   debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
@@ -98,7 +98,7 @@ class FrisbeePDP
         nod[:node_name] = node[:name]
         node[:interfaces].each do |i|
           if i[:role] == "control"
-            nod[:node_ip] = i[:ip][:address]
+            nod[:node_ip] = i[:ips].first[:address]
             nod[:node_mac] = i[:mac]
           elsif i[:role] == "cm_network"
             nod[:node_cm_ip] = i[:ip][:address]

data/lib/nitos_testbed_rc/user.rb

@@ -168,8 +168,7 @@ module OmfRc::ResourceProxy::User
 
           File.write("#{path}/id_rsa.pub", pub_key.to_pem)
           File.write("#{path}/id_rsa", key.to_pem)
-          
-          sleep 1
+
           res.inform(:status, {
             status_type: 'APP_EVENT',
             event: event_type.to_s.upcase,
@@ -200,8 +199,6 @@ module OmfRc::ResourceProxy::User
             File.write("#{path}/id_rsa.pub", pub_key)
             File.write("#{path}/id_rsa", key.to_pem)
           end
-
-          sleep 1
           res.inform(:status, {
             status_type: 'APP_EVENT',
             event: event_type.to_s.upcase,

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.2"
+    VERSION = "2.0.0"
   end
-end
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - NITOS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_rc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -124,25 +135,26 @@ files:
 - nitos_testbed_rc.gemspec
 homepage: http://nitlab.inf.uth.gr
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nitos_testbed_rc
-rubygems_version: 2.1.11
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: NITOS testbed resource controllers.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTNhYTM2OTIyZmYxYTcyOTk5OGMyZWY4N2YwZDAxOWViZmVmNjk1OA==
-  data.tar.gz: !binary |-
-    NDQxYTg1Njc3NGZiYzAzOWIwZDc3OWFkZTVjMzc2NWU4ZmEwMzdiNw==
-SHA512:
-  metadata.gz: !binary |-
-    NWE4MDliMTk3ZDRmYmU1MTI5MjA4MGZjOTM3MWI1YmU2ZDhlYWE5ZDVjMGQx
-    YThmOTk1MTk0ODU5ZjVjZGVmYWQyYjhlNWM1N2JmOTU5NjkyNmMwYTg0NTM5
-    NWY4MTFmYzgzNjIxMmRkZmQxNDczNDgzNzc5ODM4YzM4MjU1ODQ=
-  data.tar.gz: !binary |-
-    ZTY4MTAxM2IwOTliOWMyYjU3ZTNhMGFmZTBmOTM5Zjg0ZGIzMTEzNThkYmY5
-    NDczNzQyOGU2ZjJhMGU0MDc2OTc0NDUxZmJmMTc1NTNiYzFhMGJkYzkxMTkw
-    NmJiNTJjZjVjNGMzYzA0OGM1MDQ4ZjU3YzQ5ZTAxZGVmMjUwODk=