#2851: Send network drivers xml via STDIN

2025-03-22 18:50:08 +03:00 · 2019-03-01 11:14:53 -06:00 · 2019-03-01 11:14:53 -06:00 · 8121175b6e
commit 8121175b6e
parent 7e14b181e4
26 changed files with 51 additions and 47 deletions
--- a/src/vmm_mad/exec/one_vmm_exec.rb
+++ b/src/vmm_mad/exec/one_vmm_exec.rb
@ -221,8 +221,12 @@ class VmmAction
                    vnm = @vnm_src
                end

-                result, info = vnm.do_action(@id, step[:action],
-                            :parameters => get_parameters(step[:parameters]))
+                params = get_parameters(step[:parameters])
+
+                result, info = vnm.do_action(@id,
+                                             step[:action],
+                                             :stdin => true,
+                                             :parameters => params)
            when :tm
                result, info = @tm.do_transfer_action(@id, step[:parameters])

--- a/src/vnm_mad/one_vnm.rb
+++ b/src/vnm_mad/one_vnm.rb
@ -52,7 +52,7 @@ class VirtualNetworkDriver
            :parameters => nil
        }.merge(ops)

-        cmd_params =  "#{@vm_encoded}"
+        cmd_params =  ''
        cmd_params << " #{options[:parameters]}" if options[:parameters]

        result = RESULT[:success]
@ -66,7 +66,7 @@ class VirtualNetworkDriver
            elsif @ssh_stream != nil
                if options[:stdin]
                    cmdin = "cat << EOT | #{cmd}"
-                    stdin = "#{options[:stdin]}\nEOT\n"
+                    stdin = "#{@vm_encoded}\nEOT\n"
                else
                    cmdin = cmd
                    stdin = nil
--- a/src/vnm_mad/remotes/802.1Q/clean
+++ b/src/vnm_mad/remotes/802.1Q/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vlan_tag_driver'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = VLANTagDriver::XPATH_FILTER

--- a/src/vnm_mad/remotes/802.1Q/post
+++ b/src/vnm_mad/remotes/802.1Q/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vlan_tag_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VLANTagDriver::XPATH_FILTER

 begin
--- a/src/vnm_mad/remotes/802.1Q/pre
+++ b/src/vnm_mad/remotes/802.1Q/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vlan_tag_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VLANTagDriver::XPATH_FILTER

 hm = VLANTagDriver.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/802.1Q/update_sg
+++ b/src/vnm_mad/remotes/802.1Q/update_sg
@ -22,8 +22,8 @@ $: << File.join(File.dirname(__FILE__), "..")
 require 'vnmmad'
 require 'vlan_tag_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VLANTagDriver::XPATH_FILTER

 begin
--- a/src/vnm_mad/remotes/bridge/clean
+++ b/src/vnm_mad/remotes/bridge/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vnmmad'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = "TEMPLATE/NIC[VN_MAD='bridge']"

--- a/src/vnm_mad/remotes/bridge/pre
+++ b/src/vnm_mad/remotes/bridge/pre
@ -16,13 +16,13 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #

-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "..")
+$LOAD_PATH << File.dirname(__FILE__)
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..')

 require 'vnmmad'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = "TEMPLATE/NIC[VN_MAD='bridge']"

 hm = VNMMAD::NoVLANDriver.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ebtables/clean
+++ b/src/vnm_mad/remotes/ebtables/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'Ebtables'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = EbtablesVLAN::XPATH_FILTER

--- a/src/vnm_mad/remotes/ebtables/post
+++ b/src/vnm_mad/remotes/ebtables/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'Ebtables'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = EbtablesVLAN::XPATH_FILTER

 onevlan = EbtablesVLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ebtables/pre
+++ b/src/vnm_mad/remotes/ebtables/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'Ebtables'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = EbtablesVLAN::XPATH_FILTER

 onevlan = EbtablesVLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ebtables/update_sg
+++ b/src/vnm_mad/remotes/ebtables/update_sg
@ -22,8 +22,8 @@ $: << File.join(File.dirname(__FILE__), "..")
 require 'vnmmad'
 require 'Ebtables'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = EbtablesVLAN::XPATH_FILTER

 begin
--- a/src/vnm_mad/remotes/fw/clean
+++ b/src/vnm_mad/remotes/fw/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vnmmad'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = "TEMPLATE/NIC[VN_MAD='fw']"

--- a/src/vnm_mad/remotes/fw/post
+++ b/src/vnm_mad/remotes/fw/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vnmmad'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = "TEMPLATE/NIC[VN_MAD='fw']"

 begin
--- a/src/vnm_mad/remotes/fw/pre
+++ b/src/vnm_mad/remotes/fw/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vnmmad'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = "TEMPLATE/NIC[VN_MAD='fw']"

 hm = VNMMAD::NoVLANDriver.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/fw/update_sg
+++ b/src/vnm_mad/remotes/fw/update_sg
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vnmmad'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = "TEMPLATE/NIC[VN_MAD='fw']"

 begin
--- a/src/vnm_mad/remotes/ovswitch/clean
+++ b/src/vnm_mad/remotes/ovswitch/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitch'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = OpenvSwitchVLAN::XPATH_FILTER

--- a/src/vnm_mad/remotes/ovswitch/post
+++ b/src/vnm_mad/remotes/ovswitch/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitch'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = OpenvSwitchVLAN::XPATH_FILTER

 ovs = OpenvSwitchVLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ovswitch/pre
+++ b/src/vnm_mad/remotes/ovswitch/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitch'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = OpenvSwitchVLAN::XPATH_FILTER

 ovs = OpenvSwitchVLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ovswitch_vxlan/clean
+++ b/src/vnm_mad/remotes/ovswitch_vxlan/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitchVXLAN'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = OpenvSwitchVXLAN::XPATH_FILTER

--- a/src/vnm_mad/remotes/ovswitch_vxlan/post
+++ b/src/vnm_mad/remotes/ovswitch_vxlan/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitchVXLAN'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = OpenvSwitchVXLAN::XPATH_FILTER

 ovs = OpenvSwitchVXLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/ovswitch_vxlan/pre
+++ b/src/vnm_mad/remotes/ovswitch_vxlan/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'OpenvSwitchVXLAN'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = OpenvSwitchVXLAN::XPATH_FILTER

 ovs = OpenvSwitchVXLAN.from_base64(template64, xpath_filter, deploy_id)
--- a/src/vnm_mad/remotes/vxlan/clean
+++ b/src/vnm_mad/remotes/vxlan/clean
@ -21,7 +21,7 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vxlan_driver'

-template64   = ARGV[0]
+template64   = STDIN.read
 deploy_id    = nil
 xpath_filter = VXLANDriver::XPATH_FILTER

--- a/src/vnm_mad/remotes/vxlan/post
+++ b/src/vnm_mad/remotes/vxlan/post
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vxlan_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VXLANDriver::XPATH_FILTER

 begin
--- a/src/vnm_mad/remotes/vxlan/pre
+++ b/src/vnm_mad/remotes/vxlan/pre
@ -21,8 +21,8 @@ $: << File.join(File.dirname(__FILE__), "..")

 require 'vxlan_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VXLANDriver::XPATH_FILTER


--- a/src/vnm_mad/remotes/vxlan/update_sg
+++ b/src/vnm_mad/remotes/vxlan/update_sg
@ -22,8 +22,8 @@ $: << File.join(File.dirname(__FILE__), "..")
 require 'vnmmad'
 require 'vxlan_driver'

-template64   = ARGV[0]
-deploy_id    = ARGV[1]
+template64   = STDIN.read
+deploy_id    = ARGV[0]
 xpath_filter = VXLANDriver::XPATH_FILTER

 begin