From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 13/16] mg-schema-test-database: Change
	username for back-to-main-db xref
Date: Mon, 7 Dec 2015 17:27:31 +0000
Message-ID: <1449509254-27007-14-git-send-email-ian.jackson@eu.citrix.com>
References: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta4.messagelabs.com ([85.158.143.247])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=776955424=Ian.Jackson@citrix.com>)
	id 1a5zZk-000893-I2
	for xen-devel@lists.xenproject.org; Mon, 07 Dec 2015 17:27:48 +0000
In-Reply-To: <1449509254-27007-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

The `username' of the xdbref task in the test db, referring to the
main db, is changed to `PARENT' (from `<username>@<nodename>').

Currently this is purely cosmetic, but it is going to be useful to
distinguish the two cases:
 * This is a test DB and contains references to a parent
 * This is a parent DB (probably the main DB) which contains
   references to child test DBS.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch
---
 mg-schema-test-database |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mg-schema-test-database b/mg-schema-test-database
index b1b5e60..78f26db 100755
--- a/mg-schema-test-database
+++ b/mg-schema-test-database
@@ -152,10 +152,11 @@ make_xdbref_task () {
 	local refkey=$1; shift
 	local comment=$1; shift
 	local refinfo=$1; shift
+	local taskusername=$1; shift
 	echo "
 		INSERT INTO tasks
 			(type, refkey, username, comment, live, refinfo)
-		  VALUES ('xdbref','$refkey','$username@$nodename',
+		  VALUES ('xdbref','$refkey','$taskusername',
 			  '$comment','t','$refinfo');
 	"
 }
@@ -373,7 +374,8 @@ END
 	for task in $tasks; do
 		psql_do <<END
 			BEGIN;
-			$(make_xdbref_task $dbname 'borrowed for test db' $task)
+			$(make_xdbref_task $dbname 'borrowed for test db' \
+				$task "$username@$nodename")
 			UPDATE resources SET owntaskid = $(borrowtaskid $task)
 				WHERE owntaskid=$task;
 			COMMIT;
@@ -411,7 +413,7 @@ END
 	# As we copy, we note everything we're not borrowing as
 	# belonging to the parent db.
 	cat >>$t.import <<END
-		$(make_xdbref_task $maindbname 'not borrowed' '')
+		$(make_xdbref_task $maindbname 'not borrowed' '' PARENT)
 		UPDATE resources
 			SET owntaskid = $(taskid xdbref $maindbname)
 			WHERE owntaskid != $(borrowtaskid $task);
-- 
1.7.10.4