From fe46ac0ad55ea5ae85a5549aeac1c69b7a60b1ff Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 31 Oct 2022 12:10:50 +0800 Subject: [PATCH] feat(misc): use python3 for scripts/codegen.py --- pkg/apis/compute/zz_generated.model.go | 14 ++++++-------- pkg/apis/identity/zz_generated.model.go | 1 + scripts/codegen.py | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go index c4c6c5605e..c6a862bb9d 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -17,10 +17,10 @@ package compute import ( time "time" + cloudprovider "yunion.io/x/cloudmux/pkg/cloudprovider" jsonutils "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/apis" - "yunion.io/x/onecloud/pkg/apis/cloudprovider" ) // SAccessGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SAccessGroup. @@ -820,11 +820,9 @@ type SElasticcache struct { NetworkId string `json:"network_id"` // 带宽 Bandwidth int `json:"bandwidth"` - // 安全组 - SecurityGroupId string `json:"security_group_id"` - // 内网DNS + // 内网DNS PrivateDNS string `json:"private_dns"` - // 内网IP地址 + // 内网IP地址 PrivateIpAddr string `json:"private_ip_addr"` // 内网访问端口 PrivateConnectPort int `json:"private_connect_port"` @@ -1867,9 +1865,9 @@ type SLoadbalancerHealthCheck struct { // 健康检查路径 / HealthCheckHttpCode string `json:"health_check_http_code"` HealthCheckRise int `json:"health_check_rise"` - // 健康检查健康阈值 3秒 + // 健康检查健康阈值 3秒 HealthCheckFall int `json:"health_check_fall"` - // 健康检查不健康阈值 15秒 + // 健康检查不健康阈值 15秒 HealthCheckTimeout int `json:"health_check_timeout"` // 健康检查超时时间 10秒 HealthCheckInterval int `json:"health_check_interval"` @@ -2533,7 +2531,7 @@ type SSchedtag struct { apis.SStandaloneResourceBase apis.SScopedResourceBase DefaultStrategy string `json:"default_strategy"` - // Column(VARCHAR(16, charset='ascii'), nullable=True, default='') + // Column(VARCHAR(16, charset='ascii'), nullable=True, default=”) ResourceType string `json:"resource_type"` } diff --git a/pkg/apis/identity/zz_generated.model.go b/pkg/apis/identity/zz_generated.model.go index 400a976d79..f43795de0f 100644 --- a/pkg/apis/identity/zz_generated.model.go +++ b/pkg/apis/identity/zz_generated.model.go @@ -187,6 +187,7 @@ type SLocalUser struct { Name string `json:"name"` FailedAuthCount int `json:"failed_auth_count"` NeedResetPassword *bool `json:"need_reset_password,omitempty"` + ResetHint string `json:"reset_hint"` } // SNonlocalUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SNonlocalUser. diff --git a/scripts/codegen.py b/scripts/codegen.py index 36d1f5b0f2..a4dfc9cd50 100755 --- a/scripts/codegen.py +++ b/scripts/codegen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import os