From bda5f58086c87817fbe8252155535cb8369d5e4f Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Tue, 12 Mar 2024 16:50:22 +0800 Subject: [PATCH 1/2] fix:modify virtual machine interfaces Former-commit-id: 36de12f7eabd1df67329d8b8c22a1c25430d5a3e --- api/desc/vm/pcm-vm.api | 4 ---- api/etc/pcm.yaml | 17 +++++++++++------ api/internal/types/types.go | 4 ---- rpc/etc/pcmcore.yaml | 3 ++- 4 files changed, 13 insertions(+), 15 deletions(-) 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 11d07339..c62b6a3d 100644 --- a/api/etc/pcm.yaml +++ b/api/etc/pcm.yaml @@ -5,14 +5,17 @@ Port: 8999 Timeout: 50000 DB: - DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local + #DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local + DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true&loc=Local Redis: - Host: 10.206.0.12:6379 + Host: 47.92.88.143:6379 + #Host: 10.206.0.12:6379 Pass: redisPW123 Cache: - Host: 10.206.0.12:6379 + # - Host: 10.206.0.12:6379 Pass: redisPW123 # k8s rpc @@ -67,15 +70,17 @@ 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 NonBlock: true Timeout: 20000 # core rpc PcmCoreRpcConf: - target: nacos://10.206.0.12:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + # target: nacos://10.206.0.12:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + target: nacos://47.92.88.143:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api # Endpoints: # - 127.0.0.1:8888 NonBlock: true diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 7073c61b..b0b966e8 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -2507,8 +2507,6 @@ type Limits struct { } type GetComputeLimitsReq struct { - Limit int32 `json:"limit,optional"` - OffSet int32 `json:"offSet,optional"` Platform string `json:"platform,optional"` } @@ -2541,8 +2539,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: From dff5870e3e8dcc4701d16f5953bf7a23547437aa Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Tue, 12 Mar 2024 16:58:11 +0800 Subject: [PATCH 2/2] fix:modify virtual machine interfaces Former-commit-id: 565a4a6b574a8515cd33becd8e06d7f0980289e9 --- api/etc/pcm.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/api/etc/pcm.yaml b/api/etc/pcm.yaml index c62b6a3d..41fb111f 100644 --- a/api/etc/pcm.yaml +++ b/api/etc/pcm.yaml @@ -5,17 +5,17 @@ Port: 8999 Timeout: 50000 DB: - #DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local - 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 + #DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true&loc=Local Redis: - Host: 47.92.88.143:6379 - #Host: 10.206.0.12:6379 + #Host: 47.92.88.143:6379 + Host: 10.206.0.12:6379 Pass: redisPW123 Cache: + #- Host: 10.206.0.12:6379 - Host: 10.206.0.12:6379 - # - Host: 10.206.0.12:6379 Pass: redisPW123 # k8s rpc @@ -72,6 +72,8 @@ OctopusRpcConf: OpenstackRpcConf: # 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 @@ -79,8 +81,8 @@ OpenstackRpcConf: # core rpc PcmCoreRpcConf: - # target: nacos://10.206.0.12:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api - target: nacos://47.92.88.143:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + target: nacos://10.206.0.12:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api + # target: nacos://47.92.88.143:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api # Endpoints: # - 127.0.0.1:8888 NonBlock: true