qiwang
/
pcm-openstack
forked from JointCloud/pcm-openstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:Modify configuration

This commit is contained in:
qiwang 2024-03-12 16:29:40 +08:00
parent 61bbf7ef9e
commit 2b8c446df7
3 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/pcmopenstack.yaml
View File

@ -15,7 +15,7 @@ Participant:
openstackConfig:
Status_created: 201
TokenHeader: "X-Subject-Token"
ZhiJiang:
ZhiJiang_Openstack_T:
USER: "admin"
PASSWORD: "Nudt@123"
DOMAIN: "Default"
@ -30,9 +30,9 @@ openstackConfig:
OpenstackVolumev2Url: "http://10.105.20.9:8776/v2/aa7366b7f0e9453a9ba8bc699aa97b1e"
OpenstackLimitsUrl: "http://10.105.20.9:8774"
OpenstackBareMetalUrl: ""
Platform: "ZhiJiang"
Platform: "ZhiJiang_Openstack_T"
Id: "default"
Nudt:
Nudt_Openstack_R:
USER: "admin"
PASSWORD: "KzNGIS7EkDwalZmqgdpa2b9bNWFpa7GdnBLhjaxP"
DOMAIN: "Default"
@ -47,9 +47,9 @@ openstackConfig:
OpenstackVolumev2Url: "http://172.20.184.1:8776/v2/9f6db6c0f4704390b34991faf60c1822"
OpenstackLimitsUrl: "http://172.20.184.1:8774"
OpenstackBareMetalUrl: ""
Platform: "Nudt"
Platform: "Nudt_Openstack_R"
Id: "default"
DianKe_T:
DianKe_Openstack_T:
USER: "admin"
PASSWORD: "28b474f30dc3497d"
DOMAIN: "Default"
@ -64,9 +64,9 @@ openstackConfig:
OpenstackVolumev2Url: "http://10.200.1.82:8776/v2/9f6db6c0f4704390b34991faf60c1822"
OpenstackLimitsUrl: "http://10.200.1.82:8774"
OpenstackBareMetalUrl: ""
Platform: "DianKe_T"
Platform: "DianKe_Openstack_T"
Id: "default"
DianKe_R:
DianKe_Openstack_R:
USER: "admin"
PASSWORD: "nrfD3plQn9ro3WZ3nFmejFA3F7y5VpGwL0KARvlq"
DOMAIN: "Default"
@ -81,7 +81,7 @@ openstackConfig:
OpenstackVolumev2Url: "http://10.200.15.121:8776/v2/9f6db6c0f4704390b34991faf60c1822"
OpenstackLimitsUrl: "http://10.200.15.121:8774"
OpenstackBareMetalUrl: ""
Platform: "DianKe_R"
Platform: "DianKe_Openstack_R"
Id: "default"
# core rpc
PcmCoreRpcConf:

80
internal/common/tokenService.go
View File

@ -87,14 +87,14 @@ var (
func GetOpenstackConfWithPlatform(platform string) (*config.Conf, error) {
var conf config.Conf
switch platform {
case C.OpenstackConfig.Nudt.Platform:
conf = C.OpenstackConfig.Nudt
case C.OpenstackConfig.ZhiJiang.Platform:
conf = C.OpenstackConfig.ZhiJiang
case C.OpenstackConfig.DianKe_T.Platform:
conf = C.OpenstackConfig.DianKe_T
case C.OpenstackConfig.DianKe_R.Platform:
conf = C.OpenstackConfig.DianKe_R
case C.OpenstackConfig.Nudt_Openstack_R.Platform:
conf = C.OpenstackConfig.Nudt_Openstack_R
case C.OpenstackConfig.ZhiJiang_Openstack_T.Platform:
conf = C.OpenstackConfig.ZhiJiang_Openstack_T
case C.OpenstackConfig.DianKe_Openstack_T.Platform:
conf = C.OpenstackConfig.DianKe_Openstack_T
case C.OpenstackConfig.DianKe_Openstack_R.Platform:
conf = C.OpenstackConfig.DianKe_Openstack_R
default:
return nil, fmt.Errorf("platform not supported")
}
@ -107,38 +107,38 @@ func GetToken(Platform string) (token string) {
TokenUrl string
)
switch Platform {
case C.OpenstackConfig.ZhiJiang.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.ZhiJiang.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.ZhiJiang.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.ZhiJiang.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.ZhiJiang.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.ZhiJiang.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.ZhiJiang.DOMAIN
TokenUrl = C.OpenstackConfig.ZhiJiang.TokenUrl
case C.OpenstackConfig.Nudt.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.Nudt.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.Nudt.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.Nudt.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.Nudt.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.Nudt.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.Nudt.DOMAIN
TokenUrl = C.OpenstackConfig.Nudt.TokenUrl
case C.OpenstackConfig.DianKe_T.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_T.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_T.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_T.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_T.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_T.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_T.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe_T.TokenUrl
case C.OpenstackConfig.DianKe_R.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_R.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_R.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_R.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_R.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_R.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_R.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe_R.TokenUrl
case C.OpenstackConfig.ZhiJiang_Openstack_T.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.ZhiJiang_Openstack_T.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.ZhiJiang_Openstack_T.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.ZhiJiang_Openstack_T.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.ZhiJiang_Openstack_T.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.ZhiJiang_Openstack_T.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.ZhiJiang_Openstack_T.DOMAIN
TokenUrl = C.OpenstackConfig.ZhiJiang_Openstack_T.TokenUrl
case C.OpenstackConfig.Nudt_Openstack_R.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.Nudt_Openstack_R.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.Nudt_Openstack_R.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.Nudt_Openstack_R.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.Nudt_Openstack_R.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.Nudt_Openstack_R.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.Nudt_Openstack_R.DOMAIN
TokenUrl = C.OpenstackConfig.Nudt_Openstack_R.TokenUrl
case C.OpenstackConfig.DianKe_Openstack_T.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_Openstack_T.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_Openstack_T.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_Openstack_T.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_Openstack_T.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_Openstack_T.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_Openstack_T.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe_Openstack_T.TokenUrl
case C.OpenstackConfig.DianKe_Openstack_R.Platform:
a.Auth.Scope.Project.Name = C.OpenstackConfig.DianKe_Openstack_R.USER
a.Auth.Scope.Project.Domain.Id = C.OpenstackConfig.DianKe_Openstack_R.Id
a.Auth.Identity.Methods = append(a.Auth.Identity.Methods, C.OpenstackConfig.DianKe_Openstack_R.AuthMethod)
a.Auth.Identity.Password.User.Name = C.OpenstackConfig.DianKe_Openstack_R.USER
a.Auth.Identity.Password.User.Password = C.OpenstackConfig.DianKe_Openstack_R.PASSWORD
a.Auth.Identity.Password.User.Domain.Name = C.OpenstackConfig.DianKe_Openstack_R.DOMAIN
TokenUrl = C.OpenstackConfig.DianKe_Openstack_R.TokenUrl
default:
}

12
internal/config/openstackConfig.go
View File

@ -1,12 +1,12 @@
package config
type OpenstackConfig struct {
ZhiJiang Conf `json:"ZhiJiang"`
Nudt Conf `json:"Nudt"`
DianKe_T Conf `json:"DianKe_T"`
DianKe_R Conf `json:"DianKe_R"`
Status_created int `json:"Status_created"`
TokenHeader string `json:"TokenHeader"`
ZhiJiang_Openstack_T Conf `json:"ZhiJiang_Openstack_T"`
Nudt_Openstack_R Conf `json:"Nudt_Openstack_R"`
DianKe_Openstack_T Conf `json:"DianKe_Openstack_T"`
DianKe_Openstack_R Conf `json:"DianKe_Openstack_R"`
Status_created int `json:"Status_created"`
TokenHeader string `json:"TokenHeader"`
}
type Conf struct {