From ba9983bd7dab47267ed77731fcd0d7ecdb1e9c04 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 9 Jun 2021 19:51:28 +0000 Subject: [PATCH] B #5096: Remove unneeded functions --- include/Template.h | 8 --- include/VirtualMachine.h | 6 +- include/VirtualMachineTemplate.h | 5 -- src/rm/RequestManagerVirtualMachine.cc | 2 +- src/template/Template.cc | 42 ------------- src/vm/VirtualMachine.cc | 81 +------------------------- 6 files changed, 5 insertions(+), 139 deletions(-) diff --git a/include/Template.h b/include/Template.h index f4dd0b6c22..78fa09e688 100644 --- a/include/Template.h +++ b/include/Template.h @@ -457,12 +457,6 @@ public: return false; } - virtual bool test_restricted_merge(string& rs_attr, - const Template* base) const - { - return false; - } - /** * Encrypt all secret attributes */ @@ -547,8 +541,6 @@ protected: bool check_restricted(string& rs_attr, const std::map >& ras); - bool test_restricted_merge(string& rs_attr, const Template* base, - const std::map >& ras) const; /** * Parses a list of encrypted attributes in the form ATTRIBUTE_NAME or * ATTRIBUTE_NAME/SUBATTRIBUTE. diff --git a/include/VirtualMachine.h b/include/VirtualMachine.h index 6547d10a6c..91fe41a659 100644 --- a/include/VirtualMachine.h +++ b/include/VirtualMachine.h @@ -1198,11 +1198,9 @@ public: * @param err description if any * @return template with the attributes */ - VirtualMachineTemplate * get_updateconf_template() const; - - bool test_restricted_merge(string& ra, const VirtualMachineTemplate * source) const + bool check_restricted(string& ra, VirtualMachineTemplate * source) const { - return source->test_restricted_merge(ra, obj_template); + return source->check_restricted(ra, obj_template); } // ------------------------------------------------------------------------- diff --git a/include/VirtualMachineTemplate.h b/include/VirtualMachineTemplate.h index f5d3e56a2f..6fbc6a6c1b 100644 --- a/include/VirtualMachineTemplate.h +++ b/include/VirtualMachineTemplate.h @@ -66,11 +66,6 @@ public: return Template::check_restricted(rs_attr, base, restricted); } - virtual bool test_restricted_merge(string& rs_attr, const Template* base) const override - { - return Template::test_restricted_merge(rs_attr, base, restricted); - } - virtual bool check_restricted(string& rs_attr) { return Template::check_restricted(rs_attr, restricted); diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index 36e8cdd2ca..9b3dd38e4e 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -3181,7 +3181,7 @@ void VirtualMachineUpdateConf::request_execute( { string aname; - bool has_restricted = vm->test_restricted_merge(aname, uc_tmpl.get()); + bool has_restricted = vm->check_restricted(aname, uc_tmpl.get()); if (has_restricted) { diff --git a/src/template/Template.cc b/src/template/Template.cc index cd93dff7bc..3582cbc8dd 100644 --- a/src/template/Template.cc +++ b/src/template/Template.cc @@ -865,48 +865,6 @@ bool Template::check_restricted(string& ra, const Template* base, return false; } -// ----------------------------------------------------------------------------- - -bool Template::test_restricted_merge(string& ra, const Template* base, - const std::map >& ras) const -{ - std::map >::const_iterator rit; - - for ( rit = ras.begin(); rit != ras.end(); ++rit ) - { - if (!(rit->second).empty()) - { - vector rvalues, rvalues_base; - bool has_restricted; - - has_restricted = restricted_values(rit->first, rit->second, this, rvalues); - restricted_values(rit->first, rit->second, base, rvalues_base); - - if ( rvalues != rvalues_base && has_restricted) - { - ra = rit->first; - return true; - } - } - else - { - if ( get(rit->first, ra) ) - { - string ra_b; - - base->get(rit->first, ra_b); - - if ( ra_b != ra ) - { - ra = rit->first; - return true; - } - } - } - } - - return false; -} /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index c72ccf0ec7..50ecc723a6 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -2737,17 +2737,6 @@ void VirtualMachine::get_public_clouds(const string& pname, set &clouds) /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ - -static std::map> UPDATECONF_ATTRS = { - {"OS", {"ARCH", "MACHINE", "KERNEL", "INITRD", "BOOTLOADER", "BOOT", "KERNEL_CMD", "ROOT", "SD_DISK_BUS"} }, - {"FEATURES", {"PAE", "ACPI", "APIC", "LOCALTIME", "HYPERV", "GUEST_AGENT", - "VIRTIO_SCSI_QUEUES"} }, - {"INPUT", {"TYPE", "BUS"} }, - {"GRAPHICS", {"TYPE", "LISTEN", "PASSWD", "KEYMAP", "COMMAND"} }, - {"RAW", {"TYPE", "DATA", "DATA_VMX"} }, - {"CPU_MODEL", {"MODEL"} } - }; - /** * Replaces the values of a vector value, preserving the existing ones */ @@ -2769,8 +2758,8 @@ static void replace_vector_values(Template *old_tmpl, Template *new_tmpl, } else { - std::vector vnames = UPDATECONF_ATTRS[name]; - std::vector::iterator it; + std::vector vnames = VirtualMachineTemplate::UPDATECONF_ATTRS[name]; + std::vector::iterator it; for (it = vnames.begin(); it != vnames.end(); ++it) { @@ -2786,45 +2775,6 @@ static void replace_vector_values(Template *old_tmpl, Template *new_tmpl, } }; -/** - * returns a copy the values of a vector value - */ -static void copy_vector_values(Template *old_tmpl, Template *new_tmpl, - const char * name) -{ - string value; - - VectorAttribute * old_attr = old_tmpl->get(name); - - if ( old_attr == 0 ) - { - return; - } - - VectorAttribute * new_vattr = new VectorAttribute(name); - - std::vector vnames = UPDATECONF_ATTRS[name]; - std::vector::iterator it; - - for (it = vnames.begin(); it != vnames.end(); ++it) - { - std::string vval = old_attr->vector_value(*it); - - if (!vval.empty()) - { - new_vattr->replace(*it, vval); - } - } - - if ( new_vattr->empty() ) - { - delete new_vattr; - } - else - { - new_tmpl->set(new_vattr); - } -} /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ @@ -2974,33 +2924,6 @@ int VirtualMachine::updateconf(VirtualMachineTemplate& tmpl, string &err) return 0; } -/* -------------------------------------------------------------------------- */ -/* -------------------------------------------------------------------------- */ - -VirtualMachineTemplate * VirtualMachine::get_updateconf_template() const -{ - VirtualMachineTemplate * conf_tmpl = new VirtualMachineTemplate(); - - copy_vector_values(obj_template, conf_tmpl, "OS"); - - copy_vector_values(obj_template, conf_tmpl, "FEATURES"); - - copy_vector_values(obj_template, conf_tmpl, "INPUT"); - - copy_vector_values(obj_template, conf_tmpl, "GRAPHICS"); - - copy_vector_values(obj_template, conf_tmpl, "RAW"); - - VectorAttribute * context = obj_template->get("CONTEXT"); - - if ( context != 0 ) - { - conf_tmpl->set(context->clone()); - } - - return conf_tmpl; -} - /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ /* VirtualMachine Disks Interface */