From 2e1d40f70aaedf7096c71fa3c5d9afe8f47f4590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= <quxuan@yunionyun.com>
Date: Sat, 15 Sep 2018 14:11:49 +0800
Subject: [PATCH] resolve conflict

---
 pkg/compute/guestdrivers/aliyun.go | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go
index 0e89a40aef..9e7ff19758 100644
--- a/pkg/compute/guestdrivers/aliyun.go
+++ b/pkg/compute/guestdrivers/aliyun.go
@@ -586,30 +586,30 @@ func (self *SAliyunGuestDriver) RequestChangeVmConfig(ctx context.Context, guest
 	return nil
 }
 
-// func (self *SAliyunGuestDriver) RequestStartOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, userCred mcclient.TokenCredential, task taskman.ITask) (jsonutils.JSONObject, error) {
-// 	ihost, e := host.GetIHost()
-// 	if e != nil {
-// 		return nil, e
-// 	}
+/*func (self *SAliyunGuestDriver) RequestStartOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, userCred mcclient.TokenCredential, task taskman.ITask) (jsonutils.JSONObject, error) {
+	ihost, e := host.GetIHost()
+	if e != nil {
+		return nil, e
+	}
 
-// 	ivm, e := ihost.GetIVMById(guest.GetExternalId())
-// 	if e != nil {
-// 		return nil, e
-// 	}
+	ivm, e := ihost.GetIVMById(guest.GetExternalId())
+	if e != nil {
+		return nil, e
+	}
 
-// 	result := jsonutils.NewDict()
-// 	if ivm.GetStatus() != models.VM_RUNNING {
-// 		if err := ivm.StartVM(); err != nil {
-// 			return nil, e
-// 		} else {
-// 			task.ScheduleRun(result)
-// 		}
-// 	} else {
-// 		result.Add(jsonutils.NewBool(true), "is_running")
-// 	}
+	result := jsonutils.NewDict()
+	if ivm.GetStatus() != models.VM_RUNNING {
+		if err := ivm.StartVM(); err != nil {
+			return nil, e
+		} else {
+			task.ScheduleRun(result)
+		}
+	} else {
+		result.Add(jsonutils.NewBool(true), "is_running")
+	}
 
-// 	return result, e
-// }
+	return result, e
+}*/
 
 /*func (self *SAliyunGuestDriver) RequestRebuildRootDisk(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
 	ihost, e := guest.GetHost().GetIHost()