From 3b6247bb2bb0d8315e59d29ec2e459f94c64799c Mon Sep 17 00:00:00 2001 From: qiwang <1364512070@qq.com> Date: Sat, 16 Dec 2023 15:32:00 +0800 Subject: [PATCH] =?UTF-8?q?openstack=20=E4=BF=AE=E6=94=B9=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E7=AB=AF=E5=8F=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/pcmopenstack.yaml | 9 +++++---- openstack/pcm-openstack.pb.go | 6 +++--- pb/pcm-openstack.proto | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/etc/pcmopenstack.yaml b/etc/pcmopenstack.yaml index 61d5c50..1bd77ab 100644 --- a/etc/pcmopenstack.yaml +++ b/etc/pcmopenstack.yaml @@ -31,23 +31,24 @@ openstackConfig: OpenstackLimitsUrl: "http://10.105.20.9:8774" OpenstackBareMetalUrl: "" Platform: "zhijiang" + Id: "default" Nudt: USER: "admin" PASSWORD: "GYk5mgrU35eRJTfX5fg9tAJKuREyyzTuNtD3XTpF" DOMAIN: "Default" - TokenUrl: "http://172.20.32.237:35357/v3/auth/tokens?nocatalog" + TokenUrl: "http://172.20.184.1:35357/v3/auth/tokens?nocatalog" Status_created: 201 ProjectName: "admin" TokenHeader: X-Subject-Token AuthMethod: "password" OpenstackNetworkUrl: "http://172.20.32.237:9696" OpenstackImageUrl: "http://172.20.32.237:9292" - OpenstackComputeUrl: "http://172.20.32.237:8774/v2.1/c48f8a7a68844dfeb09d6ba9e49442a3" - OpenstackVolumev2Url: "http://172.20.32.237:8776/v2/c48f8a7a68844dfeb09d6ba9e49442a3" + OpenstackComputeUrl: "http://172.20.32.237:8774/v2.1/9f6db6c0f4704390b34991faf60c1822" + OpenstackVolumev2Url: "http://172.20.32.237:8776/v2/9f6db6c0f4704390b34991faf60c1822" OpenstackLimitsUrl: "http://172.20.32.237:8774" OpenstackBareMetalUrl: "" Platform: "Nudt" - + Id: "default" # core rpc PcmCoreRpcConf: diff --git a/openstack/pcm-openstack.pb.go b/openstack/pcm-openstack.pb.go index 92987c0..b13c834 100644 --- a/openstack/pcm-openstack.pb.go +++ b/openstack/pcm-openstack.pb.go @@ -25129,7 +25129,7 @@ type UpdatePortResp_Port struct { AdminStateUp bool `protobuf:"varint,1,opt,name=admin_state_up,json=adminStateUp,proto3" json:"admin_state_up,omitempty"` AllowedAddressPairs []*UpdatePortResp_AllowedAddressPairs `protobuf:"bytes,2,rep,name=allowed_address_pairs,json=allowedAddressPairs,proto3" json:"allowed_address_pairs,omitempty"` - BindingHostId string `protobuf:"bytes,3,opt,name=binding_host_id,json=Binding:profile,proto3" json:"binding_host_id,omitempty"` + BindingHostId string `protobuf:"bytes,3,opt,name=binding_host_id,json=binding:host_id,proto3" json:"binding_host_id,omitempty"` BindingProfile *UpdatePortResp_BindingProfile `protobuf:"bytes,4,opt,name=Binding_profile,json=Binding:profile,proto3" json:"Binding_profile,omitempty"` BindingVifDetails *UpdatePortResp_BindingVifDetails `protobuf:"bytes,5,opt,name=binding_vif_details,json=Binding:vif_details,proto3" json:"binding_vif_details,omitempty"` BindingVifType string `protobuf:"bytes,6,opt,name=binding_vif_type,json=binding:vif_type,proto3" json:"binding_vif_type,omitempty"` @@ -41103,8 +41103,8 @@ var file_pcm_openstack_proto_rawDesc = []byte{ 0x70, 0x61, 0x69, 0x72, 0x73, 0x52, 0x13, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x50, 0x61, 0x69, 0x72, 0x73, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0f, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x70, 0x72, 0x6f, - 0x66, 0x69, 0x6c, 0x65, 0x12, 0x53, 0x0a, 0x0f, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, + 0x01, 0x28, 0x09, 0x52, 0x0f, 0x62, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x68, 0x6f, 0x73, + 0x74, 0x5f, 0x69, 0x64, 0x12, 0x53, 0x0a, 0x0f, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, diff --git a/pb/pcm-openstack.proto b/pb/pcm-openstack.proto index 8aad2a3..b70b911 100644 --- a/pb/pcm-openstack.proto +++ b/pb/pcm-openstack.proto @@ -1904,7 +1904,7 @@ message UpdatePortResp { message Port { bool admin_state_up = 1; repeated Allowed_address_pairs allowed_address_pairs = 2; - string binding_host_id = 3[json_name="Binding:profile"]; + string binding_host_id = 3[json_name="binding:host_id"]; Binding_profile Binding_profile = 4[json_name="Binding:profile"]; Binding_vif_details binding_vif_details = 5 [json_name="Binding:vif_details"]; string binding_vif_type = 6 [json_name="binding:vif_type"];