From 2e9ff9aac0b98053a62af5ac3f79ce4c071945e6 Mon Sep 17 00:00:00 2001
From: zhanggang <zhanggang@cmss.chinamobile.com>
Date: Fri, 3 Nov 2017 23:59:52 -0400
Subject: [PATCH] Fix duplicate instancetask code.

Each kind of instance task should have a unique code,
BUILDING_ERROR_TIMEOUT_GA and BUILDING_ERROR_REPLICA has the same
code(0x54), UPGRADING_ERROR and UPGRADING = InstanceTask has the same
code(0x59).

Change-Id: I8851ea5cf1a85fb81d010e4d2cca24cea124033f
---
 trove/instance/tasks.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/trove/instance/tasks.py b/trove/instance/tasks.py
index 6ec366f33a..6ca913e1cc 100644
--- a/trove/instance/tasks.py
+++ b/trove/instance/tasks.py
@@ -91,10 +91,6 @@ class InstanceTasks(object):
     BUILDING_ERROR_VOLUME = InstanceTask(0x52, 'BUILDING',
                                          'Build error: Volume.',
                                          is_error=True)
-    BUILDING_ERROR_TIMEOUT_GA = InstanceTask(0x54, 'ERROR',
-                                             'Build error: '
-                                             'guestagent timeout.',
-                                             is_error=True)
     BUILDING_ERROR_SEC_GROUP = InstanceTask(0x53, 'BUILDING',
                                             'Build error: Secgroup '
                                             'or rule.',
@@ -114,10 +110,14 @@ class InstanceTasks(object):
     SHRINKING_ERROR = InstanceTask(0x58, 'SHRINKING',
                                          'Shrinking Cluster Error.',
                                          is_error=True)
-    UPGRADING_ERROR = InstanceTask(0x59, 'UPGRADING',
+    UPGRADING = InstanceTask(0x59, 'UPGRADING', 'Upgrading the instance.')
+    UPGRADING_ERROR = InstanceTask(0x5a, 'UPGRADING',
                                          'Upgrading Cluster Error.',
                                          is_error=True)
-    UPGRADING = InstanceTask(0x59, 'UPGRADING', 'Upgrading the instance.')
+    BUILDING_ERROR_TIMEOUT_GA = InstanceTask(0x5b, 'ERROR',
+                                             'Build error: '
+                                             'guestagent timeout.',
+                                             is_error=True)
 
 # Dissuade further additions at run-time.
 InstanceTask.__init__ = None