diff --git a/api/desc/vm/pcm-vm.api b/api/desc/vm/pcm-vm.api index 724d0d45..ea709651 100644 --- a/api/desc/vm/pcm-vm.api +++ b/api/desc/vm/pcm-vm.api @@ -36,8 +36,6 @@ type ( absolute Absolute `json:"absolute,optional"` } GetComputeLimitsReq { - Limit int32 `json:"limit,optional"` - OffSet int32 `json:"offSet,optional"` Platform string `json:"platform,optional"` } @@ -68,8 +66,6 @@ type ( absolute VolumeAbsolute `json:"absolute,optional"` } GetVolumeLimitsReq { - Limit int32 `json:"limit,optional"` - OffSet int32 `json:"offSet,optional"` Platform string `json:"platform,optional"` } diff --git a/api/etc/pcm.yaml b/api/etc/pcm.yaml index 32e7b269..41c9c2e8 100644 --- a/api/etc/pcm.yaml +++ b/api/etc/pcm.yaml @@ -5,7 +5,7 @@ Port: 8999 Timeout: 50000 DB: - DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true&loc=Local + DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local Redis: Host: 10.206.0.12:6379 @@ -67,9 +67,12 @@ OctopusRpcConf: Timeout: 20000 OpenstackRpcConf: - target: nacos://10.206.0.12:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api - # Endpoints: - # - 127.0.0.1:8888 + # target: nacos://10.206.0.12:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + # target: nacos://127.0.0.1:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + #Endpoints: + #- 127.0.0.1:2010 + Endpoints: + - 127.0.0.1:2010 NonBlock: true Timeout: 20000 diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 7d4c971c..323c7c6a 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -2488,8 +2488,6 @@ type Limits struct { } type GetComputeLimitsReq struct { - Limit int32 `json:"limit,optional"` - OffSet int32 `json:"offSet,optional"` Platform string `json:"platform,optional"` } @@ -2522,8 +2520,6 @@ type VolumeLimits struct { } type GetVolumeLimitsReq struct { - Limit int32 `json:"limit,optional"` - OffSet int32 `json:"offSet,optional"` Platform string `json:"platform,optional"` } diff --git a/rpc/etc/pcmcore.yaml b/rpc/etc/pcmcore.yaml index 7be42380..70902acf 100644 --- a/rpc/etc/pcmcore.yaml +++ b/rpc/etc/pcmcore.yaml @@ -4,7 +4,8 @@ ListenOn: 0.0.0.0:2004 Timeout: 15000 # 15s,设置rpc服务的响应的超时时间,若超过15s还未返回则结束请求 DB: - DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true + # DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true + DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true #链路追踪 # Telemetry: