From 56e8c81a17110ec9efb94b97741a98d7fd994a4f Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Wed, 18 Nov 2020 18:56:20 +0100 Subject: [PATCH] M #-: minor change in provider update operation (#441) --- src/oneprovision/lib/provider/provider.rb | 2 +- src/oneprovision/lib/provision_element.rb | 4 ++-- src/oneprovision/lib/provision_template/provision_template.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/oneprovision/lib/provider/provider.rb b/src/oneprovision/lib/provider/provider.rb index 4f9667b1a5..e11b41f60a 100644 --- a/src/oneprovision/lib/provider/provider.rb +++ b/src/oneprovision/lib/provider/provider.rb @@ -22,7 +22,7 @@ module OneProvision DOCUMENT_TYPE = 102 # These attributes can not be changed when updating the provider - UNMUTABLE_ATTRS = %w[provider] + IMMUTABLE_ATTRS = %w[provider] # Allocates a new document # diff --git a/src/oneprovision/lib/provision_element.rb b/src/oneprovision/lib/provision_element.rb index 0f4e3b9f26..a5eb463de7 100644 --- a/src/oneprovision/lib/provision_element.rb +++ b/src/oneprovision/lib/provision_element.rb @@ -47,11 +47,11 @@ module OneProvision if template_json template_json = JSON.parse(template_json) - if template_json.keys != @body.keys + if template_json.keys.sort != @body.keys.sort return OpenNebula::Error.new('Keys can not be changed') end - self.class::UNMUTABLE_ATTRS.each do |attr| + self.class::IMMUTABLE_ATTRS.each do |attr| next if template_json[attr] == @body[attr] return OpenNebula::Error.new("`#{attr}` can not be changed") diff --git a/src/oneprovision/lib/provision_template/provision_template.rb b/src/oneprovision/lib/provision_template/provision_template.rb index f62a093f9f..6e461913b0 100644 --- a/src/oneprovision/lib/provision_template/provision_template.rb +++ b/src/oneprovision/lib/provision_template/provision_template.rb @@ -23,7 +23,7 @@ module OneProvision DOCUMENT_TYPE = 104 # These attributes can not be changed when updating the template - UNMUTABLE_ATTRS = %w[name provider] + IMMUTABLE_ATTRS = %w[name provider] # Allocates a new document #