Automated cherry pick of #23377: Automated cherry pick of #23374: fix(region,host): guest add vnc screen dump support (#23378)

* fix(host): update nic confs inside vm on qga delete nics

Signed-off-by: wanyaoqi <[email protected]>

* fix(region,host): guest add vnc screen dump support

---------

Signed-off-by: wanyaoqi <[email protected]>

Author: wanyaoqi

cmd/climc/shell/compute/servers.go

@@ -144,6 +144,8 @@ func init() {
 	cmd.Get("sshport", new(options.ServerIdOptions))
 	cmd.Get("qemu-info", new(options.ServerIdOptions))
 	cmd.Get("hardware-info", new(options.ServerIdOptions))
+	cmd.Get("screen-dump-show", new(options.ServerScreenDumpOptions))
+	cmd.BatchPerform("screen-dump", new(options.ServerIdsOptions))
 
 	cmd.GetProperty(&options.ServerStatusStatisticsOptions{})
 	cmd.GetProperty(&options.ServerProjectStatisticsOptions{})

cmd/climc/shell/compute/serverscreendumps.go

@@ -0,0 +1,23 @@
+package compute
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+type ServerScreenDumpListOptions struct {
+	options.BaseListOptions
+	Server string `help:"Id or name of server"`
+}
+
+func (o *ServerScreenDumpListOptions) Params() (jsonutils.JSONObject, error) {
+	return jsonutils.Marshal(o), nil
+}
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.ServerScreenDumps)
+	cmd.List(new(ServerScreenDumpListOptions))
+}

pkg/apis/compute/guest_image.go

@@ -27,3 +27,26 @@ type SImagesInGuest struct {
 	RootImage  SSubImage
 	DataImages []SSubImage
 }
+
+type SGuestScreenDump struct {
+	S3AccessKey  string
+	S3SecretKey  string
+	S3Endpoint   string
+	S3BucketName string
+	S3ObjectName string
+	S3UseSSL     bool
+}
+
+type GuestScreenDumpListInput struct {
+	Server string
+}
+
+type GetDetailsGuestScreenDumpInput struct {
+	ObjectName string
+}
+
+type GetDetailsGuestScreenDumpOutput struct {
+	GuestId    string
+	Name       string
+	ScreenDump string
+}

pkg/cloudcommon/db/db_dispatcher.go

@@ -1077,12 +1077,15 @@ func (dispatcher *DBModelDispatcher) GetSpecific(ctx context.Context, idStr stri
 
 	funcName := fmt.Sprintf("GetDetails%s", specCamel)
 	funcValue := modelValue.MethodByName(funcName)
+	log.Errorf("MethodByName %s", funcName)
 	if !funcValue.IsValid() || funcValue.IsNil() {
+		log.Errorf("MethodByName2 %s", funcName)
 		return nil, httperrors.NewSpecNotFoundError("%s %s %s not found", dispatcher.Keyword(), idStr, spec)
 	}
 
 	outs, err := callFunc(funcValue, funcName, params...)
 	if err != nil {
+		log.Errorf("MethodByName4 %s", funcName)
 		return nil, err
 	}
 	if len(outs) != 2 {
@@ -1092,6 +1095,7 @@ func (dispatcher *DBModelDispatcher) GetSpecific(ctx context.Context, idStr stri
 	resVal := outs[0]
 	errVal := outs[1].Interface()
 	if !gotypes.IsNil(errVal) {
+		log.Errorf("MethodByName3 %s", funcName)
 		return nil, errVal.(error)
 	} else {
 		if gotypes.IsNil(resVal.Interface()) {

pkg/cloudcommon/db/opslog_const.go

@@ -267,6 +267,7 @@ const (
 	ACT_GUEST_CREATE_FROM_IMPORT_SUCC    = "guest_create_from_import_succ"
 	ACT_GUEST_CREATE_FROM_IMPORT_FAIL    = "guest_create_from_import_fail"
 	ACT_GUEST_PANICKED                   = "guest_panicked"
+	ACT_GUEST_SCREEN_DUMP                = "guest_screen_dump"
 	ACT_HOST_MAINTENANCE                 = "host_maintenance"
 	ACT_HOST_DOWN                        = "host_down"
 

pkg/cloudcommon/options/options.go

@@ -163,6 +163,7 @@ type CommonOptions struct {
 
 type HostCommonOptions struct {
 	CommonOptions
+	S3ScreenDumpOptions
 
 	ExecutorSocketPath     string `help:"Executor socket path" default:"/var/run/onecloud/exec.sock"`
 	DeployServerSocketPath string `help:"Deploy server listen socket path" default:"/var/run/onecloud/deploy.sock"`
@@ -176,6 +177,15 @@ type HostCommonOptions struct {
 	Qcow2Preallocation            string `help:"Qcow2 image create preallocation" default:"metadata" choices:"disable|metadata|falloc|full"`
 }
 
+type S3ScreenDumpOptions struct {
+	S3AccessKey              string `help:"s3 access key"`
+	S3SecretKey              string `help:"s3 secret key"`
+	S3Endpoint               string `help:"s3 endpoint"`
+	S3UseSSL                 bool   `help:"s3 access use ssl"`
+	S3BucketName             string `help:"s3 bucket name" default:"onecloud-screendump"`
+	S3BucketLifecycleKeepDay int    `help:"s3 bucket lifecycle keep day" default:"180"`
+}
+
 type DBOptions struct {
 	SqlConnection string `help:"SQL connection string" alias:"connection"`
 

pkg/compute/guestdrivers/base.go

@@ -522,6 +522,10 @@ func (drv *SBaseGuestDriver) RequestQgaCommand(ctx context.Context, userCred mcc
 	return nil, httperrors.ErrNotImplemented
 }
 
+func (self *SBaseGuestDriver) RequestGuestScreenDump(ctx context.Context, userCred mcclient.TokenCredential, body jsonutils.JSONObject, host *models.SHost, guest *models.SGuest) (jsonutils.JSONObject, error) {
+	return nil, httperrors.ErrNotImplemented
+}
+
 func (drv *SBaseGuestDriver) FetchMonitorUrl(ctx context.Context, guest *models.SGuest) string {
 	s := auth.GetAdminSessionWithPublic(ctx, consts.GetRegion())
 	tsdbURL, err := tsdb.GetDefaultServiceSourceURL(s, options.Options.MonitorEndpointType)

pkg/compute/guestdrivers/kvm.go

@@ -1201,6 +1201,17 @@ func (self *SKVMGuestDriver) RequestQgaCommand(ctx context.Context, userCred mcc
 	return res, nil
 }
 
+func (self *SKVMGuestDriver) RequestGuestScreenDump(ctx context.Context, userCred mcclient.TokenCredential, body jsonutils.JSONObject, host *models.SHost, guest *models.SGuest) (jsonutils.JSONObject, error) {
+	url := fmt.Sprintf("%s/servers/%s/guest-screen-dump", host.ManagerUri, guest.Id)
+	httpClient := httputils.GetDefaultClient()
+	header := mcclient.GetTokenHeaders(userCred)
+	_, res, err := httputils.JSONRequest(httpClient, ctx, "POST", url, header, nil, false)
+	if err != nil {
+		return nil, errors.Wrap(err, "host request")
+	}
+	return res, nil
+}
+
 func (self *SKVMGuestDriver) FetchMonitorUrl(ctx context.Context, guest *models.SGuest) string {
 	if options.Options.KvmMonitorAgentUseMetadataService && !guest.IsSriov() {
 		var metadataIp string

pkg/compute/models/guest_actions.go

@@ -148,15 +148,27 @@ func (self *SGuest) PerformEvent(ctx context.Context, userCred mcclient.TokenCre
 	}
 	if event == "GUEST_PANICKED" {
 		kwargs := jsonutils.NewDict()
-		kwargs.Set("reason", data)
+		kwargs.Set("reason", jsonutils.NewString(event))
+		if data.Contains("screen_dump_info") {
+			screenDumpInfo := api.SGuestScreenDump{}
+			if err := data.Unmarshal(&screenDumpInfo, "screen_dump_info"); err != nil {
+				log.Errorf("failed unmarshal screen_dump_info %s", err)
+			} else {
+				kwargs.Set("screen_dump_name", jsonutils.NewString(screenDumpInfo.S3ObjectName))
+				if _, err := self.SaveGuestScreenDump(ctx, userCred, &screenDumpInfo); err != nil {
+					log.Errorf("SaveGuestScreenDump failed %s", err)
+				}
+			}
+		}
 
-		db.OpsLog.LogEvent(self, db.ACT_GUEST_PANICKED, data.String(), userCred)
-		logclient.AddSimpleActionLog(self, logclient.ACT_GUEST_PANICKED, data.String(), userCred, true)
+		db.OpsLog.LogEvent(self, db.ACT_GUEST_PANICKED, kwargs.String(), userCred)
+		logclient.AddSimpleActionLog(self, logclient.ACT_GUEST_PANICKED, kwargs.String(), userCred, true)
 		notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
 			Obj:    self,
 			Action: notifyclient.ActionServerPanicked,
 			IsFail: true,
 		})
+
 	}
 	return nil, nil
 }

pkg/compute/models/guestdrivers.go

@@ -255,6 +255,8 @@ type IGuestDriver interface {
 
 	BeforeDetachIsolatedDevice(ctx context.Context, cred mcclient.TokenCredential, guest *SGuest, dev *SIsolatedDevice) error
 	BeforeAttachIsolatedDevice(ctx context.Context, cred mcclient.TokenCredential, guest *SGuest, dev *SIsolatedDevice) error
+
+	RequestGuestScreenDump(ctx context.Context, userCred mcclient.TokenCredential, body jsonutils.JSONObject, host *SHost, guest *SGuest) (jsonutils.JSONObject, error)
 }
 
 var guestDrivers map[string]IGuestDriver