From fd9cae60e0370dca408c5940d60a67c720104fea Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Wed, 8 Sep 2021 10:43:17 -0500 Subject: [PATCH] M #: Remove 1604 conflicting validation from lxd reboot (#1442) (cherry picked from commit 8c14b0b1b9967c241a6d70129d5485dc36426e54) --- src/vmm_mad/remotes/lxd/reboot | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/vmm_mad/remotes/lxd/reboot b/src/vmm_mad/remotes/lxd/reboot index cbb98d2701..48b74dc3a6 100755 --- a/src/vmm_mad/remotes/lxd/reboot +++ b/src/vmm_mad/remotes/lxd/reboot @@ -23,15 +23,6 @@ require 'base64' require_relative '../../scripts_common' -# Ref: https://rgxdb.com/r/1NUN74O6 -def base64?(str) - b64_rexp = %r{^(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==)|(?:[a-zA-Z0-9+/]{1}===))$} - - b64_rexp.match?(str.strip) -rescue StandardError - false -end - # ------------------------------------------------------------------------------ # Action Arguments, STDIN doesn't include XML description of the OpenNebula VM # ------------------------------------------------------------------------------ @@ -41,7 +32,7 @@ client = LXDClient.new container = Container.get(vm_name, nil, client) xml = container.config['user.xml'] -xml = Base64.decode64(xml) if base64?(xml) +xml = Base64.decode64(xml) container = Container.get(vm_name, xml, client)