Browse Source

fix:modify virtual machine interfaces

Former-commit-id: 36de12f7ea
pull/45/head
qiwang 1 year ago
parent
commit
bda5f58086
4 changed files with 13 additions and 15 deletions
  1. +0
    -4
      api/desc/vm/pcm-vm.api
  2. +11
    -6
      api/etc/pcm.yaml
  3. +0
    -4
      api/internal/types/types.go
  4. +2
    -1
      rpc/etc/pcmcore.yaml

+ 0
- 4
api/desc/vm/pcm-vm.api View File

@@ -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"`
}



+ 11
- 6
api/etc/pcm.yaml View File

@@ -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


+ 0
- 4
api/internal/types/types.go View File

@@ -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"`
}



+ 2
- 1
rpc/etc/pcmcore.yaml View File

@@ -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:


Loading…
Cancel
Save