nitos_testbed_rc 1.0.0.pre.8 → 1.0.0.pre.9

data/README.md

@@ -10,11 +10,21 @@ save and load images to nodes.
 
 - User resource controller which administers users.
 
-- om6 script which orchistrates the above.
+- omf6 script which orchistrates the above.
 
 These tools are under development. Unpredictable behaviour is to be expected untill
 a stable version is provided.
 
+
+Prerequirements
+---------------
+
+Install frisbee, which is required by the frisbee proxy
+
+    % 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'.
+
 Installation
 ------------
 
@@ -22,7 +32,7 @@ First you need to install the gem
   
     % gem install nitos_testbed_rc --pre
 
-Then you need to run the install_ntrc script to generate the configuration files.
+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
 
@@ -36,25 +46,30 @@ Use omf_cert.rb script to generate the following certificates and place them on
     % cd /root/.omf
 
 Create a root certificate (change DOMAIN).
-Importand!!! 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.
 
-    % ruby omf_cert.rb --email root@DOMAIN -o /root/.omf/trusted_roots/root.pem --duration 5000000 create_root
+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
 
 Create a certificate for user_proxy of NTRC (change DOMAIN, XMPP_DOMAIN and if you wish the output file names).
 
-    % ruby 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).
 
-    % ruby 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).
 
-    % ruby 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
+
+
 
 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).
 
-    % ./omf_cert.rb -o user_cert.pem --email root@DOMAIN --user root --root ~/.omf/trusted_roots/root.pem --duration 50000000 --geni_uri URI:urn:publicid:IDN+DOMAIN+user+USERNAME create_user
+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.
+
+    % 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
 
 Configuration files
 -------------------
@@ -142,7 +157,9 @@ Change configuration file '/etc/nitos_testbed/frisbee_proxy_conf.yaml', which is
       #multicastIF: 192.168.204.1
       :multicastIF: 10.0.1.200
 
-Change configuration file '~/.omf/etc/user_proxy_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:
+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:
 
     :xmpp:
       :script_user: script_user

data/etc/cm_proxy_conf.yaml

@@ -15,6 +15,9 @@
 #time (in seconds) before timeout error occurs
 :timeout: 80
 
+#time (in seconds) before timeout error occurs
+:pxeSymLinkConfFile: omf-5.4
+
 #operation mode for OmfCommon.init (development, production, etc)
 :operationMode: development
 

data/etc/frisbee_proxy_conf.yaml

@@ -41,6 +41,7 @@
   :frisbeedBin: /usr/sbin/frisbeed
   :frisbeeBin: /usr/sbin/frisbee
   :imagezipClientBin: /usr/bin/imagezip
+  :imagezipClientNC: /bin/nc
   :imagezipServerBin: /bin/nc
 
   # Local interface to bind to for frisbee traffic

data/lib/nitos_testbed_rc/cm_factory.rb

@@ -267,7 +267,7 @@ module OmfRc::ResourceProxy::CMFactory
     if resp == :on
       symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
       if !File.exists?("#{symlink_name}")
-        File.symlink("/tftpboot/pxelinux.cfg/omf-5.4", "#{symlink_name}")
+        File.symlink("/tftpboot/pxelinux.cfg/#{@config[:pxeSymLinkConfFile]}", "#{symlink_name}")
       end
       debug "Start_node_pxe RESET: http://#{node[:node_cm_ip].to_s}/reset"
       begin
@@ -284,7 +284,7 @@ module OmfRc::ResourceProxy::CMFactory
     elsif resp == :off
       symlink_name = "/tftpboot/pxelinux.cfg/01-#{node[:node_mac]}"
       if !File.exists?("#{symlink_name}")
-        File.symlink("/tftpboot/pxelinux.cfg/omf-5.4", "#{symlink_name}")
+        File.symlink("/tftpboot/pxelinux.cfg/#{@config[:pxeSymLinkConfFile]}", "#{symlink_name}")
       end
       debug "Start_node_pxe ON: http://#{node[:node_cm_ip].to_s}/on"
       begin

data/lib/nitos_testbed_rc/imagezip_client.rb

@@ -53,7 +53,7 @@ module OmfRc::ResourceProxy::ImagezipClient #Imagezip client
 
       client.property.app_id = client.hrn.nil? ? client.uid : client.hrn
 
-      command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | /bin/nc -q 0 #{client.property.ip} #{client.property.port}"
+      command = "#{client.property.binary_path} -o -z1 #{client.property.hardrive} - | #{@fconf[:imagezipClientNC]} -q 0 #{client.property.ip} #{client.property.port}"
       debug "Executing command #{command}"
   #     nod = {node_name: "node1", node_ip: "10.0.0.1", node_mac: "00-03-1d-0d-4b-96", node_cm_ip: "10.0.0.101"}
       summary = ''

data/lib/version.rb

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

data/nitos_testbed_rc.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "omf_rc", "~> 6.1.3"
   s.add_runtime_dependency "nokogiri", "~> 1.6.0"
   s.add_runtime_dependency "progress_bar", "~> 1.0.3"
-  s.add_development_dependency "net-ssh", "~> 2.8.0"
+  s.add_runtime_dependency "net-ssh", "~> 2.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nitos_testbed_rc
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.8
+  version: 1.0.0.pre.9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_common
@@ -83,7 +83,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false