nitos_testbed_rc 1.0.0.pre.10 → 1.0.0.pre.11

data/README.md

@@ -21,7 +21,7 @@ Prerequirements
 
 Install frisbee, which is required by the frisbee proxy
 
-    % apt-get install frisbee
+    $ apt-get install frisbee
 
 If that fails add this line 'deb http://pkg.mytestbed.net/ubuntu precise/ ' to your /etc/apt/sources.list and then 'apt-get update'.
 
@@ -30,46 +30,48 @@ Installation
 
 First you need to install the gem
   
-    % gem install nitos_testbed_rc --pre
+    $ gem install nitos_testbed_rc --pre
 
 Then you need to run the install_ntrc script to generate the configuration files [tutorial](http://mytestbed.net/doc/omf/file.set_up_communication_server.html).
 
-    % install_ntrc
+    $ install_ntrc
 
 Create certificates
 -------------------
 
 Use omf_cert.rb script to generate the following certificates and place them on directories '/root/.omf' and /root/.omf.
 
-    % mkdir /root/.omf
-    % mkdir /root/.omf/trusted_roots
-    % cd /root/.omf
+    $ mkdir /root/.omf
+    $ mkdir /root/.omf/trusted_roots
+    $ cd /root/.omf
 
 Create a root certificate (change DOMAIN).
 
 Important!!! If you already have a root certificate (probably created while installing omf_sfa) DO NOT create this certificate again and use the old one instead.
 
-    % omf_cert.rb --email root@DOMAIN -o /root/.omf/trusted_roots/root.pem --duration 5000000 create_root
+    $ omf_cert.rb --email root@DOMAIN -o /root/.omf/trusted_roots/root.pem --duration 5000000 create_root
 
 Create a certificate for user_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you wish the output file names).
 
-    % omf_cert.rb -o user_factory.pem --email user_factory@DOMAIN --resource-type user_factory --resource-id xmpp://user_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
+    $ omf_cert.rb -o user_factory.pem --email user_factory@DOMAIN --resource-type user_factory --resource-id xmpp://user_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
 
 Create a certificate for cm_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you wish the output file names).
 
-    % omf_cert.rb -o cm_factory.pem --email cm_factory@DOMAIN --resource-type cm_factory --resource-id xmpp://cm_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
+    $ omf_cert.rb -o cm_factory.pem --email cm_factory@DOMAIN --resource-type cm_factory --resource-id xmpp://cm_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
 
 Create a certificate for frisbee_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you wish the output file names).
 
-    % omf_cert.rb -o frisbee_factory.pem --email frisbee_factory@DOMAIN --resource-type frisbee_factory --resource-id xmpp://frisbee_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
+    $ omf_cert.rb -o frisbee_factory.pem --email frisbee_factory@DOMAIN --resource-type frisbee_factory --resource-id xmpp://frisbee_factory@XMPP_DOMAIN --root /root/.omf/trusted_roots/root.pem --duration 50000000 create_resource
 
 
+Finally, omf6 script will be used by every user in the server, so we need to create a certificate for each user and place it in folder '~/.omf'. 
 
-Create a certificate for the omf6 script, this certificate is inside the directory '~/.omf', every user of the testbed should have his own certificate in order to use omf6 script (change DOMAIN, USERNAME and if you wish the output file names).
+Important (just for the root user)!!! If you already have a certificate for the root user in folder /root/.omf (probably created while installing omf_sfa) DO NOT create this certificate again and use the old one instead.
 
-Important!!! If you already have a user_cert.pem certificate in folder /root/.omf (probably created while installing omf_sfa) DO NOT create this certificate again and use the old one instead.
+Use this commands to generate a certificate for a user (change DOMAIN, USERNAME and if you wish the output file names) 
 
-    % omf_cert.rb -o user_cert.pem --email USERNAME@DOMAIN --user USERNAME --root ~/.omf/trusted_roots/root.pem --duration 50000000 --geni_uri URI:urn:publicid:IDN+DOMAIN+user+USERNAME create_user
+    $ omf_cert.rb -o user_cert.pem --email USERNAME@DOMAIN --user USERNAME --root /root/.omf/trusted_roots/root.pem --duration 50000000 --geni_uri URI:urn:publicid:IDN+DOMAIN+user+USERNAME create_user
+    $ cp user_cert.pem /home/USERNAME/.omf
 
 Configuration files
 -------------------
@@ -159,16 +161,21 @@ Change configuration file '/etc/nitos_testbed_rc/frisbee_proxy_conf.yaml', which
 
 Important!!! DO NOT modify the file /etc/nitos_testbed_rc/omf_script_conf.yaml. It is a skeleton used by the user_proxy to generate the configuration file for every user it creates.
 
-Finaly, create/modify for each user the configuration file '~/.omf/etc/omf_script_conf.yaml', which is related to omf6 script of NTRC, every user of the testbed should have his own configuration file in order to use omf6 script. For example:
+Finaly, create/modify for each user the configuration file '/home/USERNAME/.omf/etc/omf_script_conf.yaml', which is related to omf6 script of NTRC, every user of the testbed should have his own configuration file in order to use omf6 script. 
+
+    $ mkdir /home/USERNAME/.omf/etc
+    $ cp /etc/nitos_testbed_rc/omf_script_conf.yaml /home/USERNAME/.omf/etc
+
+For example:
 
     :xmpp:
-      :script_user: script_user
+      :script_user: USERNAME
       :password: pw
       :server: DOMAIN
     :auth:
-      :root_cert_dir: ~/.omf/trusted_roots
+      :root_cert_dir: /etc/nitos_testbed_rc/.omf/trusted_roots
       :entity_cert: ~/.omf/user_cert.pem
-      :entity_key: ~/.omf/user_cert.pkey
+      :entity_key: ~/.ssh/id_rsa
     #operation mode for OmfCommon.init (development, production, etc)
     :operationMode: development
     #omf script configuration
@@ -181,9 +188,9 @@ Run proxies
 
 To start/stop/restart the upstart service of nitos_testbed_rc use:
 
-    % start ntrc 
-    % stop ntrc
-    % restart ntrc
+    $ start ntrc 
+    $ stop ntrc
+    $ restart ntrc
 
 Starting ntrc as an upstart will generate the following log files:
 
@@ -195,17 +202,17 @@ Starting ntrc as an upstart will generate the following log files:
 
 Alternatively (mostly for debugging reasons) you can execute all proxies with one command:
 
-    % run_proxies
+    $ run_proxies
 
 Or you run proxies seperatly
 
-    % user_proxy
-    % cm_proxy
-    % frisbee_proxy
+    $ user_proxy
+    $ cm_proxy
+    $ frisbee_proxy
 
 Run omf6 commands
 -----------------
 
 Now you can use omf6 script to execute omf6 related commands
 
-    % omf6 --help
+    $ omf6 --help

data/bin/cm_proxy

@@ -65,8 +65,13 @@ class CmPDP
       resp = JSON.parse(response.body, :symbolize_names => true)
 
       if response.header.code != '200'
-        error "AUTH error: empty response"
-        msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+        if resp[:exception][:reason] == "No resources matching the request."
+          error "AUTH error: Node #{node_name} does not exist."
+          msg.properties.state.error_msg = "Node '#{node_name}' does not exist."
+        else
+          error "AUTH error: empty response"
+          msg.properties.state.error_msg = "#{resp[:exception][:reason]} - code: '#{resp[:exception][:code]}'"
+        end
         return msg# next
       end
 
@@ -77,13 +82,21 @@ class CmPDP
         return msg
       end
 
+      node = node[:resources].first
+
+      if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
+        debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
+        msg.properties.state.ignore_msg = true
+        return msg
+      end
+
       if acc == 'root'
-        debug "AUTH PASSED"
-        msg.properties.state.node = node[:resources].first
+        debug "AUTH PASSED (root account)"
+        msg.properties.state.node = node
         return msg
       end
 
-      node = node[:resources].first
+      
       lease = nil
       unless node[:leases].nil?
         node[:leases].each do |l|

data/bin/frisbee_proxy

@@ -69,8 +69,13 @@ class FrisbeePDP
         resp = JSON.parse(response.body, :symbolize_names => true)
 
         if response.header.code != '200'
-          error "AUTH error: empty response"
-          msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+          if resp[:exception] == "No resources matching the request."
+            error "AUTH error: Node '#{node_name}' does not exist."
+            msg.properties.state.error_msg = "Node #{node_name} does not exist."
+          else
+            error "AUTH error: empty response"
+            msg.properties.state.error_msg = "#{resp[:reason]} - code: '#{resp[:exception][:code]}'"
+          end
           return msg# next
         end
 
@@ -82,8 +87,15 @@ class FrisbeePDP
         end
 
         node = node[:resources].first
+
+        if @config[:testbedDomain] != "ALL" && node[:domain] != @config[:testbedDomain] 
+          debug "This node does not belong to the domain '#{@config[:testbedDomain]}'"
+          msg.properties.state.ignore_msg = true
+          return msg
+        end
+
         if acc == 'root'
-          debug "AUTH PASSED"
+          debug "AUTH PASSED (root account)"
           msg.properties.node = node
           return msg
         end

data/bin/omf6

@@ -787,7 +787,7 @@ def shut_down(comm)
   comm.disconnect
 end
 
-OmfCommon.init(@config[:operationMode], communication: { url: "xmpp://#{@xmpp[:script_user]}:#{@xmpp[:password]}@#{@xmpp[:server]}", auth: {} }) do
+OmfCommon.init(@config[:operationMode], {communication: { url: "xmpp://#{@xmpp[:script_user]}:#{@xmpp[:password]}@#{@xmpp[:server]}", auth: {}}, logging: {}}) do
   OmfCommon.comm.on_connected do |comm|
     OmfCommon::Auth::CertificateStore.instance.register_default_certs(trusted_roots)
     entity.resource_id = OmfCommon.comm.local_topic.address

data/etc/cm_proxy_conf.yaml

@@ -15,11 +15,14 @@
 #time (in seconds) before timeout error occurs
 :timeout: 80
 
-#time (in seconds) before timeout error occurs
+#the pxe configuration file in /tftpboot/pxelinux.cfg
 :pxeSymLinkConfFile: omf-5.4
 
 #operation mode for OmfCommon.init (development, production, etc)
 :operationMode: development
 
 #testbed xmpp topic
-:testbedTopic: am_controller
+:testbedTopic: am_controller
+
+#testbed domain (resources with other domains will be ignored unless if this has the value 'ALL')
+:testbedDomain: omf:testserver

data/etc/frisbee_proxy_conf.yaml

@@ -18,6 +18,9 @@
 #testbed xmpp topic
 :testbedTopic: am_controller
 
+#testbed domain (resources with other domains will be ignored unless if this has the value 'ALL')
+:testbedDomain: omf:testserver
+
 #frisbee and imagezip configuration
 :frisbee:
   # Directory images are stored

data/etc/omf_script_conf.yaml

@@ -5,9 +5,9 @@
 :auth:
   :root_cert_dir: ~/.omf/trusted_roots
   :entity_cert: ~/.omf/user_cert.pem
-  :entity_key: ~/.omf/user_cert.pkey
+  :entity_key: ~/.ssh/id_rsa
 #operation mode for OmfCommon.init (development, production, etc)
-:operationMode: development
+:operationMode: production
 #omf script configuration
 :omf_script:
   #default last action on load and save commands (reset or shutdown)

data/lib/nitos_testbed_rc/cm_factory.rb

@@ -28,6 +28,10 @@ module OmfRc::ResourceProxy::CMFactory
       }, :ALL)
       next
     end
+    if value.ignore_msg
+      #just ignore this message, another resource controller should take care of this message
+      next
+    end
     nod = {}
     nod[:node_name] = value.node[:name]
     value.node[:interfaces].each do |i|

data/lib/nitos_testbed_rc/frisbee.rb

@@ -39,6 +39,10 @@ module OmfRc::ResourceProxy::Frisbee #frisbee client
         }, :ALL)
         next
       end
+      if client.opts.ignore_msg
+        #just ignore this message, another resource controller should take care of this message
+        next
+      end
       nod = {}
       nod[:node_name] = client.opts.node.name
       client.opts.node.interfaces.each do |i|

data/lib/nitos_testbed_rc/frisbeed.rb

@@ -28,6 +28,14 @@ module OmfRc::ResourceProxy::Frisbeed
 
 
   hook :after_initial_configured do |server|
+    debug "Received message '#{server.opts.inspect}'"
+    if error_msg = server.opts.error_msg
+      next
+    end
+    if server.opts.ignore_msg
+      #just ignore this message, another resource controller should take care of this message
+      next
+    end
     server.property.app_id = server.hrn.nil? ? server.uid : server.hrn
     server.property.image = server.property.image.nil? ? @fconf[:imageDir] + '/' + @fconf[:defaultImage] : server.property.image
     server.property.image = server.property.image.start_with?('/') ? server.property.image : @fconf[:imageDir] + '/' + server.property.image

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -38,6 +38,10 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
         }, :ALL)
         next
       end
+      if client.opts.ignore_msg
+        #just ignore this message, another resource controller should take care of this message
+        next
+      end
 
       nod = {}
       nod[:node_name] = client.opts.node.name

data/lib/nitos_testbed_rc/imagezip_server.rb

@@ -1,4 +1,4 @@
-#Imagezip client
+#Imagezip server
 #created by parent :frisbee_factory
 #used in save command
 
@@ -24,6 +24,14 @@ module OmfRc::ResourceProxy::ImagezipServer #Imagezip server
   property :image_name, :default => @fconf[:imageDir] + '/new_image.ndz'
 
   hook :after_initial_configured do |server|
+    debug "Received message '#{server.opts.inspect}'"
+    if error_msg = server.opts.error_msg
+      next
+    end
+    if server.opts.ignore_msg
+      #just ignore this message, another resource controller should take care of this message
+      next
+    end
     server.property.app_id = server.hrn.nil? ? server.uid : server.hrn
     server.property.image_name = server.property.image_name.nil? ? @fconf[:imageDir] + '/' + @fconf[:defaultImage] : server.property.image_name
     server.property.image_name = server.property.image_name.start_with?('/') ? server.property.image_name : @fconf[:imageDir] + '/' + server.property.image_name

data/lib/version.rb

@@ -1,5 +1,5 @@
 module NITOS
   module TestbedRc
-    VERSION = "1.0.0.pre.10"
+    VERSION = "1.0.0.pre.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.10
+  version: 1.0.0.pre.11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common