OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

style: 网元模块RunSSHClient函数命名

Browse Source
This commit is contained in:
TsMask
2024-06-12 16:28:54 +08:00
parent 4f352fc241
commit e254f0b1f9
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/network_element/controller/ne_action.go
View File

@@ -52,7 +52,7 @@ func (s *NeActionController) PushFile(c *gin.Context) {
}
// 网元主机的SSH客户端
sshClient, err := s.neInfoService.NeRunSSHclient(neInfo.NeType, neInfo.NeId)
sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -102,7 +102,7 @@ func (s *NeActionController) PullFile(c *gin.Context) {
}
// 网元主机的SSH客户端
sshClient, err := s.neInfoService.NeRunSSHclient(neInfo.NeType, neInfo.NeId)
sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -155,7 +155,7 @@ func (s *NeActionController) Files(c *gin.Context) {
}
// 网元主机的SSH客户端
sshClient, err := s.neInfoService.NeRunSSHclient(neInfo.NeType, neInfo.NeId)
sshClient, err := s.neInfoService.NeRunSSHClient(neInfo.NeType, neInfo.NeId)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -236,7 +236,7 @@ func (s *NeActionController) Service(c *gin.Context) {
cmdStr = "sudo shutdown -h now"
}
_, err := s.neInfoService.NeRunCMD(body.NeType, body.NeID, cmdStr)
_, err := s.neInfoService.NeRunSSHCmd(body.NeType, body.NeID, cmdStr)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return

8
src/modules/network_element/service/ne_info.go
View File

@@ -47,11 +47,11 @@ type INeInfo interface {
// CheckUniqueNeTypeAndNeId 校验同类型下标识是否唯一
CheckUniqueNeTypeAndNeId(neType, neId, id string) bool
// NeRunSSHclient 网元主机的SSH客户端-为创建相关连接
NeRunSSHclient(neType, neId string) (*ssh.ConnSSH, error)
// NeRunSSHClient 网元主机的SSH客户端-为创建相关连接
NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error)
// NeRunCMD 向网元发送cmd命令
NeRunCMD(neType, neId, cmd string) (string, error)
// NeRunSSHCmd 网元主机的SSH客户端发送cmd命令
NeRunSSHCmd(neType, neId, cmd string) (string, error)
// neConfOAMRead 网元OAM配置文件读取
NeConfOAMRead(neType, neId string) (map[string]any, error)

26
src/modules/network_element/service/ne_info.impl.go
View File

@@ -298,26 +298,26 @@ func (r *NeInfoImpl) CheckUniqueNeTypeAndNeId(neType, neId, id string) bool {
return uniqueId == ""
}
// NeRunSSHclient 网元主机的SSH客户端-为创建相关连接
func (r *NeInfoImpl) NeRunSSHclient(neType, neId string) (*ssh.ConnSSH, error) {
// NeRunSSHClient 网元主机的SSH客户端-为创建相关连接
func (r *NeInfoImpl) NeRunSSHClient(neType, neId string) (*ssh.ConnSSH, error) {
neInfo := r.SelectNeInfoByNeTypeAndNeID(neType, neId)
if neInfo.NeId != neId {
logger.Errorf("NeRunSSHclient NeType:%s NeID:%s not found", neType, neId)
logger.Errorf("NeRunSSHClient NeType:%s NeID:%s not found", neType, neId)
return nil, fmt.Errorf("neinfo not found")
}
// 取主机信息
if neInfo.HostIDs == "" {
logger.Errorf("NeRunSSHclient NeType:%s NeID:%s hostId not found", neType, neId)
logger.Errorf("NeRunSSHClient NeType:%s NeID:%s hostId not found", neType, neId)
return nil, fmt.Errorf("neinfo hostId not found")
}
neInfo.Hosts = NewNeHostImpl.neHostRepository.SelectByIds(strings.Split(neInfo.HostIDs, ","))
if len(neInfo.Hosts) <= 0 {
logger.Errorf("NeRunSSHclient Hosts %s not found", neInfo.HostIDs)
logger.Errorf("NeRunSSHClient Hosts %s not found", neInfo.HostIDs)
return nil, fmt.Errorf("neinfo host not found")
}
neHost := neInfo.Hosts[0]
if neHost.HostType != "ssh" {
logger.Errorf("NeRunSSHclient Hosts first HostType %s not ssh", neHost.HostType)
logger.Errorf("NeRunSSHClient Hosts first HostType %s not ssh", neHost.HostType)
return nil, fmt.Errorf("neinfo host type not ssh")
}
@@ -331,15 +331,15 @@ func (r *NeInfoImpl) NeRunSSHclient(neType, neId string) (*ssh.ConnSSH, error) {
client, err = connSSH.NewClient()
}
if err != nil {
logger.Errorf("NeRunSSHclient NewClient err => %s", err.Error())
logger.Errorf("NeRunSSHClient NewClient err => %s", err.Error())
return nil, fmt.Errorf("neinfo ssh client new err")
}
return client, nil
}
// NeRunCMD 向网元发送cmd命令
func (r *NeInfoImpl) NeRunCMD(neType, neId, cmd string) (string, error) {
sshClient, err := r.NeRunSSHclient(neType, neId)
// NeRunSSHCmd 网元主机的SSH客户端发送cmd命令
func (r *NeInfoImpl) NeRunSSHCmd(neType, neId, cmd string) (string, error) {
sshClient, err := r.NeRunSSHClient(neType, neId)
if err != nil {
return "", err
}
@@ -348,7 +348,7 @@ func (r *NeInfoImpl) NeRunCMD(neType, neId, cmd string) (string, error) {
// 执行命令
output, err := sshClient.RunCMD(cmd)
if err != nil {
logger.Errorf("NeRunCMD RunCMD %s err => %s", output, err.Error())
logger.Errorf("NeRunSSHCmd RunCMD %s err => %s", output, err.Error())
return "", fmt.Errorf("neinfo ssh run cmd err")
}
return output, nil
@@ -447,7 +447,7 @@ func (r *NeInfoImpl) neConfOAMWirte(neType, neId string, content any, sync bool)
// 同步到网元端
if sync {
// 网元主机的SSH客户端
sshClient, err := r.NeRunSSHclient(neType, neId)
sshClient, err := r.NeRunSSHClient(neType, neId)
if err != nil {
return err
}
@@ -609,7 +609,7 @@ func (r *NeInfoImpl) NeConfPara5GWirte(content map[string]any, syncNE []string)
for _, neTI := range syncNE {
ti := strings.SplitN(neTI, "@", 2)
// 网元主机的SSH客户端
sshClient, err := r.NeRunSSHclient(ti[0], ti[1])
sshClient, err := r.NeRunSSHClient(ti[0], ti[1])
if err != nil {
errMsg = append(errMsg, fmt.Sprintf("%s : %s", ti, err.Error()))
continue

4
src/modules/network_element/service/ne_license.impl.go
View File

@@ -110,7 +110,7 @@ func (r *NeLicenseImpl) ReadLicenseInfo(neLicense model.NeLicense) (string, stri
nePath := fmt.Sprintf("/usr/local/etc/%s/license", neTypeLower)
// 网元主机的SSH客户端
sshClient, err := NewNeInfoImpl.NeRunSSHclient(neLicense.NeType, neLicense.NeId)
sshClient, err := NewNeInfoImpl.NeRunSSHClient(neLicense.NeType, neLicense.NeId)
if err != nil {
return "", ""
}
@@ -149,7 +149,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
}
// 网元主机的SSH客户端
sshClient, err := NewNeInfoImpl.NeRunSSHclient(neLicense.NeType, neLicense.NeId)
sshClient, err := NewNeInfoImpl.NeRunSSHClient(neLicense.NeType, neLicense.NeId)
if err != nil {
return err
}

2
src/modules/network_element/service/ne_version.impl.go
View File

@@ -89,7 +89,7 @@ func (r *NeVersionImpl) SelectByNeTypeAndNeID(neType, neId string) model.NeVersi
// action 安装行为：install upgrade rollback
func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinput map[string]string) (string, error) {
// 网元主机的SSH客户端
sshClient, err := NewNeInfoImpl.NeRunSSHclient(neVersion.NeType, neVersion.NeId)
sshClient, err := NewNeInfoImpl.NeRunSSHClient(neVersion.NeType, neVersion.NeId)
if err != nil {
return "", err
}