Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A66077875 for ; Wed, 28 Sep 2011 22:29:08 +0000 (UTC) Received: (qmail 46158 invoked by uid 500); 28 Sep 2011 22:29:08 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 46139 invoked by uid 500); 28 Sep 2011 22:29:08 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 46130 invoked by uid 99); 28 Sep 2011 22:29:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 22:29:08 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of lutter@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 22:29:02 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8SMSf4A016400 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Sep 2011 18:28:41 -0400 Received: from avon.watzmann.net (ovpn-113-29.phx2.redhat.com [10.3.113.29]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p8SMSdY3021058; Wed, 28 Sep 2011 18:28:41 -0400 From: lutter@redhat.com To: deltacloud-dev@incubator.apache.org Cc: Joseph VLcek , Greg Blomquist Subject: [PATCH 5/6] rhevm_client (create_vm): do not replace double by single quotes in user data Date: Wed, 28 Sep 2011 15:28:35 -0700 Message-Id: <1317248916-9588-6-git-send-email-lutter@redhat.com> In-Reply-To: <1317248916-9588-2-git-send-email-lutter@redhat.com> References: <1317248916-9588-2-git-send-email-lutter@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 From: David Lutterkort This is unnecessary (Nokogiri will take care of escaping quotes as char entities) and wrong, since it alters the user data. Signed-off-by: David Lutterkort --- .../lib/deltacloud/drivers/rhevm/rhevm_client.rb | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb index 79d4441..b6704b0 100644 --- a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb +++ b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb @@ -102,12 +102,6 @@ module RHEVM (result_xml/'/cluster/version').first[:major].strip == major end - def escape_user_data(data) - # Replace " with ' to keep quotes in XML attribute safe - data.gsub!(/"/, "'") - data - end - def create_vm(template_id, opts={}) opts ||= {} builder = Nokogiri::XML::Builder.new do @@ -130,7 +124,7 @@ module RHEVM # custom_property({ :name => "floppyinject", - :value => "#{RHEVM::FILEINJECT_PATH}:#{escape_user_data(Base64.decode64(opts[:user_data]))}", + :value => "#{RHEVM::FILEINJECT_PATH}:#{Base64.decode64(opts[:user_data])}", :regexp => "^.*:.*$"}) } else -- 1.7.6