Automatic merge from release/2.1.0 -> release/2.2.0

* commit '9776483cc327ef05921794c1395017fabe441ae0':
  错误处理
This commit is contained in:
邱剑
2018-12-07 20:01:24 +08:00
+3
View File
@@ -843,6 +843,9 @@ func (manager *SGuestManager) ValidateCreateData(ctx context.Context, userCred m
}*/
data, err = GetDriver(hypervisor).ValidateCreateData(ctx, userCred, data)
if err != nil {
return nil, err
}
data, err = manager.SVirtualResourceBaseManager.ValidateCreateData(ctx, userCred, ownerProjId, query, data)
if err != nil {