修正:1. 由于系统盘大小设置单位未转换,导致阿里云创建主机失败 2.

伪删除阿里云主机后,detach了系统盘,导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
This commit is contained in:
Qiu Jian
2018-07-31 00:42:18 +08:00
parent 46dab16451
commit fcee2de326
98 changed files with 564 additions and 198 deletions
+1 -1
View File
@@ -3,9 +3,9 @@ package db
import (
"strings"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/utils"
)
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"time"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/pkg/util/timeutils"
"github.com/yunionio/sqlchemy"
)
type SResourceBase struct {
+3 -3
View File
@@ -5,14 +5,14 @@ import (
"database/sql"
"fmt"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/util/regutils"
"github.com/yunionio/pkg/util/stringutils"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
type SStandaloneResourceBase struct {
@@ -109,7 +109,7 @@ func (manager *SStandaloneResourceBaseManager) ListItemFilter(ctx context.Contex
}
showEmulated := jsonutils.QueryBoolean(query, "show_emulated", false)
if ! showEmulated {
if !showEmulated {
q = q.Filter(sqlchemy.IsFalse(q.Field("is_emulated")))
}