From 63eeafea274a5d6a657e84cfb83c10e6c56d9902 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Mon, 13 Jan 2020 15:22:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=BB=84=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/secgrouprules.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index 33df586876..43685d47f7 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -34,6 +34,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/logclient" "yunion.io/x/onecloud/pkg/util/rbacutils" ) @@ -251,6 +252,9 @@ func (self *SSecurityGroupRule) ValidateUpdateData(ctx context.Context, userCred return nil, err } + // 更新操作日志: 对比可以知道改了原有规则哪些内容 + data.Add(jsonutils.Marshal(self), "origin") + return self.SResourceBase.ValidateUpdateData(ctx, userCred, query, data) } @@ -297,6 +301,7 @@ func (self *SSecurityGroupRule) PostCreate(ctx context.Context, userCred mcclien log.Debugf("POST Create %s", data) if secgroup := self.GetSecGroup(); secgroup != nil { + logclient.AddSimpleActionLog(secgroup, logclient.ACT_ALLOCATE, data, userCred, true) secgroup.DoSync(ctx, userCred) } } @@ -305,6 +310,7 @@ func (self *SSecurityGroupRule) PreDelete(ctx context.Context, userCred mcclient self.SResourceBase.PreDelete(ctx, userCred) if secgroup := self.GetSecGroup(); secgroup != nil { + logclient.AddSimpleActionLog(secgroup, logclient.ACT_DELETE, jsonutils.Marshal(self), userCred, true) secgroup.DoSync(ctx, userCred) } } @@ -314,6 +320,7 @@ func (self *SSecurityGroupRule) PostUpdate(ctx context.Context, userCred mcclien log.Debugf("POST Update %s", data) if secgroup := self.GetSecGroup(); secgroup != nil { + logclient.AddSimpleActionLog(secgroup, logclient.ACT_UPDATE, data, userCred, true) secgroup.DoSync(ctx, userCred) } }