From 0c6bb40777fcf93960d1c8dec665003eaccdadc2 Mon Sep 17 00:00:00 2001 From: Gerrit91 Date: Tue, 12 Dec 2023 13:24:45 +0100 Subject: [PATCH] Update. --- pkg/apis/v1/product_option.pb.go | 146 ++++++------------ .../io/accounting/api/v1/product_option.proto | 20 +-- 2 files changed, 57 insertions(+), 109 deletions(-) diff --git a/pkg/apis/v1/product_option.pb.go b/pkg/apis/v1/product_option.pb.go index 1e9ad5b..9a5e12c 100644 --- a/pkg/apis/v1/product_option.pb.go +++ b/pkg/apis/v1/product_option.pb.go @@ -85,10 +85,8 @@ type ProductOptionReport struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Report *Report `protobuf:"bytes,1,opt,name=report,proto3" json:"report,omitempty"` - Start *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=start,proto3" json:"start,omitempty"` - End *timestamppb.Timestamp `protobuf:"bytes,3,opt,name=end,proto3" json:"end,omitempty"` - Id ProductOption `protobuf:"varint,4,opt,name=id,proto3,enum=metalstack.io.accounting.api.v1.ProductOption" json:"id,omitempty"` + Report *Report `protobuf:"bytes,1,opt,name=report,proto3" json:"report,omitempty"` + Id ProductOption `protobuf:"varint,2,opt,name=id,proto3,enum=metalstack.io.accounting.api.v1.ProductOption" json:"id,omitempty"` } func (x *ProductOptionReport) Reset() { @@ -130,20 +128,6 @@ func (x *ProductOptionReport) GetReport() *Report { return nil } -func (x *ProductOptionReport) GetStart() *timestamppb.Timestamp { - if x != nil { - return x.Start - } - return nil -} - -func (x *ProductOptionReport) GetEnd() *timestamppb.Timestamp { - if x != nil { - return x.End - } - return nil -} - func (x *ProductOptionReport) GetId() ProductOption { if x != nil { return x.Id @@ -274,20 +258,18 @@ type ProductOptionUsage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Partition string `protobuf:"bytes,1,opt,name=partition,proto3" json:"partition,omitempty"` - Tenant string `protobuf:"bytes,2,opt,name=tenant,proto3" json:"tenant,omitempty"` - Projectid string `protobuf:"bytes,3,opt,name=projectid,proto3" json:"projectid,omitempty"` - Clusterid string `protobuf:"bytes,4,opt,name=clusterid,proto3" json:"clusterid,omitempty"` - Clustername string `protobuf:"bytes,5,opt,name=clustername,proto3" json:"clustername,omitempty"` - Start *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=start,proto3" json:"start,omitempty"` - End *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=end,proto3" json:"end,omitempty"` - Lifetime *durationpb.Duration `protobuf:"bytes,8,opt,name=lifetime,proto3" json:"lifetime,omitempty"` - Id ProductOption `protobuf:"varint,9,opt,name=id,proto3,enum=metalstack.io.accounting.api.v1.ProductOption" json:"id,omitempty"` - Projectname string `protobuf:"bytes,10,opt,name=projectname,proto3" json:"projectname,omitempty"` - Annotations []string `protobuf:"bytes,11,rep,name=annotations,proto3" json:"annotations,omitempty"` - Tenantname string `protobuf:"bytes,12,opt,name=tenantname,proto3" json:"tenantname,omitempty"` - Contractnumber string `protobuf:"bytes,13,opt,name=contractnumber,proto3" json:"contractnumber,omitempty"` - Debtorid string `protobuf:"bytes,14,opt,name=debtorid,proto3" json:"debtorid,omitempty"` + Partition string `protobuf:"bytes,1,opt,name=partition,proto3" json:"partition,omitempty"` + Tenant string `protobuf:"bytes,2,opt,name=tenant,proto3" json:"tenant,omitempty"` + Projectid string `protobuf:"bytes,3,opt,name=projectid,proto3" json:"projectid,omitempty"` + Clusterid string `protobuf:"bytes,4,opt,name=clusterid,proto3" json:"clusterid,omitempty"` + Clustername string `protobuf:"bytes,5,opt,name=clustername,proto3" json:"clustername,omitempty"` + Lifetime *durationpb.Duration `protobuf:"bytes,6,opt,name=lifetime,proto3" json:"lifetime,omitempty"` + Id ProductOption `protobuf:"varint,7,opt,name=id,proto3,enum=metalstack.io.accounting.api.v1.ProductOption" json:"id,omitempty"` + Projectname string `protobuf:"bytes,8,opt,name=projectname,proto3" json:"projectname,omitempty"` + Annotations []string `protobuf:"bytes,9,rep,name=annotations,proto3" json:"annotations,omitempty"` + Tenantname string `protobuf:"bytes,10,opt,name=tenantname,proto3" json:"tenantname,omitempty"` + Contractnumber string `protobuf:"bytes,11,opt,name=contractnumber,proto3" json:"contractnumber,omitempty"` + Debtorid string `protobuf:"bytes,12,opt,name=debtorid,proto3" json:"debtorid,omitempty"` } func (x *ProductOptionUsage) Reset() { @@ -357,20 +339,6 @@ func (x *ProductOptionUsage) GetClustername() string { return "" } -func (x *ProductOptionUsage) GetStart() *timestamppb.Timestamp { - if x != nil { - return x.Start - } - return nil -} - -func (x *ProductOptionUsage) GetEnd() *timestamppb.Timestamp { - if x != nil { - return x.End - } - return nil -} - func (x *ProductOptionUsage) GetLifetime() *durationpb.Duration { if x != nil { return x.Lifetime @@ -482,19 +450,13 @@ var file_metalstack_io_accounting_api_v1_product_option_proto_rawDesc = []byte{ 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x2c, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x69, 0x6f, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf6, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x64, 0x75, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x96, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x3f, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x69, 0x6f, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, - 0x30, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, - 0x74, 0x12, 0x2c, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, - 0x3e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, 0x65, + 0x3e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x69, 0x6f, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x02, 0x69, 0x64, 0x22, @@ -523,7 +485,7 @@ var file_metalstack_io_accounting_api_v1_product_option_proto_rawDesc = []byte{ 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x64, 0x52, 0x10, 0x61, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x55, 0x73, - 0x61, 0x67, 0x65, 0x22, 0xa7, 0x04, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, + 0x61, 0x67, 0x65, 0x22, 0xc7, 0x03, 0x0a, 0x12, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x61, @@ -533,30 +495,24 @@ var file_metalstack_io_accounting_api_v1_product_option_proto_rawDesc = []byte{ 0x0a, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x30, - 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, - 0x12, 0x2c, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x12, 0x35, - 0x0a, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, + 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x35, + 0x0a, 0x08, 0x6c, 0x69, 0x66, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x69, 0x66, - 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2e, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x6c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x69, 0x6f, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x65, 0x6e, - 0x61, 0x6e, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, + 0x61, 0x6e, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x61, 0x63, 0x74, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, + 0x74, 0x72, 0x61, 0x63, 0x74, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6e, 0x75, 0x6d, 0x62, 0x65, - 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, 0x74, 0x6f, 0x72, 0x69, 0x64, 0x18, 0x0e, 0x20, + 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x62, 0x74, 0x6f, 0x72, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x64, 0x65, 0x62, 0x74, 0x6f, 0x72, 0x69, 0x64, 0x22, 0x57, 0x0a, 0x1e, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x55, 0x73, 0x61, 0x67, 0x65, 0x41, 0x63, 0x63, 0x75, 0x6d, 0x75, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x64, 0x12, @@ -633,39 +589,35 @@ var file_metalstack_io_accounting_api_v1_product_option_proto_goTypes = []interf (*ProductOptionUsage)(nil), // 4: metalstack.io.accounting.api.v1.ProductOptionUsage (*ProductOptionUsageAccumuluated)(nil), // 5: metalstack.io.accounting.api.v1.ProductOptionUsageAccumuluated (*Report)(nil), // 6: metalstack.io.accounting.api.v1.Report - (*timestamppb.Timestamp)(nil), // 7: google.protobuf.Timestamp - (*UsageQuery)(nil), // 8: metalstack.io.accounting.api.v1.UsageQuery + (*UsageQuery)(nil), // 7: metalstack.io.accounting.api.v1.UsageQuery + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp (*durationpb.Duration)(nil), // 9: google.protobuf.Duration (*Empty)(nil), // 10: metalstack.io.accounting.api.v1.Empty } var file_metalstack_io_accounting_api_v1_product_option_proto_depIdxs = []int32{ 6, // 0: metalstack.io.accounting.api.v1.ProductOptionReport.report:type_name -> metalstack.io.accounting.api.v1.Report - 7, // 1: metalstack.io.accounting.api.v1.ProductOptionReport.start:type_name -> google.protobuf.Timestamp - 7, // 2: metalstack.io.accounting.api.v1.ProductOptionReport.end:type_name -> google.protobuf.Timestamp - 0, // 3: metalstack.io.accounting.api.v1.ProductOptionReport.id:type_name -> metalstack.io.accounting.api.v1.ProductOption - 8, // 4: metalstack.io.accounting.api.v1.ProductOptionUsageRequest.query:type_name -> metalstack.io.accounting.api.v1.UsageQuery - 7, // 5: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.from:type_name -> google.protobuf.Timestamp - 7, // 6: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.to:type_name -> google.protobuf.Timestamp - 4, // 7: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.usage:type_name -> metalstack.io.accounting.api.v1.ProductOptionUsage - 5, // 8: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.accumulated_usage:type_name -> metalstack.io.accounting.api.v1.ProductOptionUsageAccumuluated - 7, // 9: metalstack.io.accounting.api.v1.ProductOptionUsage.start:type_name -> google.protobuf.Timestamp - 7, // 10: metalstack.io.accounting.api.v1.ProductOptionUsage.end:type_name -> google.protobuf.Timestamp - 9, // 11: metalstack.io.accounting.api.v1.ProductOptionUsage.lifetime:type_name -> google.protobuf.Duration - 0, // 12: metalstack.io.accounting.api.v1.ProductOptionUsage.id:type_name -> metalstack.io.accounting.api.v1.ProductOption - 9, // 13: metalstack.io.accounting.api.v1.ProductOptionUsageAccumuluated.lifetime:type_name -> google.protobuf.Duration - 1, // 14: metalstack.io.accounting.api.v1.ProductOptionService.Added:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport - 1, // 15: metalstack.io.accounting.api.v1.ProductOptionService.Modified:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport - 1, // 16: metalstack.io.accounting.api.v1.ProductOptionService.Deleted:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport - 2, // 17: metalstack.io.accounting.api.v1.ProductOptionService.Usage:input_type -> metalstack.io.accounting.api.v1.ProductOptionUsageRequest - 10, // 18: metalstack.io.accounting.api.v1.ProductOptionService.Added:output_type -> metalstack.io.accounting.api.v1.Empty - 10, // 19: metalstack.io.accounting.api.v1.ProductOptionService.Modified:output_type -> metalstack.io.accounting.api.v1.Empty - 10, // 20: metalstack.io.accounting.api.v1.ProductOptionService.Deleted:output_type -> metalstack.io.accounting.api.v1.Empty - 3, // 21: metalstack.io.accounting.api.v1.ProductOptionService.Usage:output_type -> metalstack.io.accounting.api.v1.ProductOptionUsageResponse - 18, // [18:22] is the sub-list for method output_type - 14, // [14:18] is the sub-list for method input_type - 14, // [14:14] is the sub-list for extension type_name - 14, // [14:14] is the sub-list for extension extendee - 0, // [0:14] is the sub-list for field type_name + 0, // 1: metalstack.io.accounting.api.v1.ProductOptionReport.id:type_name -> metalstack.io.accounting.api.v1.ProductOption + 7, // 2: metalstack.io.accounting.api.v1.ProductOptionUsageRequest.query:type_name -> metalstack.io.accounting.api.v1.UsageQuery + 8, // 3: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.from:type_name -> google.protobuf.Timestamp + 8, // 4: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.to:type_name -> google.protobuf.Timestamp + 4, // 5: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.usage:type_name -> metalstack.io.accounting.api.v1.ProductOptionUsage + 5, // 6: metalstack.io.accounting.api.v1.ProductOptionUsageResponse.accumulated_usage:type_name -> metalstack.io.accounting.api.v1.ProductOptionUsageAccumuluated + 9, // 7: metalstack.io.accounting.api.v1.ProductOptionUsage.lifetime:type_name -> google.protobuf.Duration + 0, // 8: metalstack.io.accounting.api.v1.ProductOptionUsage.id:type_name -> metalstack.io.accounting.api.v1.ProductOption + 9, // 9: metalstack.io.accounting.api.v1.ProductOptionUsageAccumuluated.lifetime:type_name -> google.protobuf.Duration + 1, // 10: metalstack.io.accounting.api.v1.ProductOptionService.Added:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport + 1, // 11: metalstack.io.accounting.api.v1.ProductOptionService.Modified:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport + 1, // 12: metalstack.io.accounting.api.v1.ProductOptionService.Deleted:input_type -> metalstack.io.accounting.api.v1.ProductOptionReport + 2, // 13: metalstack.io.accounting.api.v1.ProductOptionService.Usage:input_type -> metalstack.io.accounting.api.v1.ProductOptionUsageRequest + 10, // 14: metalstack.io.accounting.api.v1.ProductOptionService.Added:output_type -> metalstack.io.accounting.api.v1.Empty + 10, // 15: metalstack.io.accounting.api.v1.ProductOptionService.Modified:output_type -> metalstack.io.accounting.api.v1.Empty + 10, // 16: metalstack.io.accounting.api.v1.ProductOptionService.Deleted:output_type -> metalstack.io.accounting.api.v1.Empty + 3, // 17: metalstack.io.accounting.api.v1.ProductOptionService.Usage:output_type -> metalstack.io.accounting.api.v1.ProductOptionUsageResponse + 14, // [14:18] is the sub-list for method output_type + 10, // [10:14] is the sub-list for method input_type + 10, // [10:10] is the sub-list for extension type_name + 10, // [10:10] is the sub-list for extension extendee + 0, // [0:10] is the sub-list for field type_name } func init() { file_metalstack_io_accounting_api_v1_product_option_proto_init() } diff --git a/proto/metalstack/io/accounting/api/v1/product_option.proto b/proto/metalstack/io/accounting/api/v1/product_option.proto index 5d6fa30..3ab2b6d 100644 --- a/proto/metalstack/io/accounting/api/v1/product_option.proto +++ b/proto/metalstack/io/accounting/api/v1/product_option.proto @@ -27,9 +27,7 @@ service ProductOptionService { message ProductOptionReport { Report report = 1; - google.protobuf.Timestamp start = 2; - google.protobuf.Timestamp end = 3; - ProductOption id = 4; + ProductOption id = 2; } message ProductOptionUsageRequest { @@ -49,15 +47,13 @@ message ProductOptionUsage { string projectid = 3; string clusterid = 4; string clustername = 5; - google.protobuf.Timestamp start = 6; - google.protobuf.Timestamp end = 7; - google.protobuf.Duration lifetime = 8; - ProductOption id = 9; - string projectname = 10; - repeated string annotations = 11; - string tenantname = 12; - string contractnumber = 13; - string debtorid = 14; + google.protobuf.Duration lifetime = 6; + ProductOption id = 7; + string projectname = 8; + repeated string annotations = 9; + string tenantname = 10; + string contractnumber = 11; + string debtorid = 12; } message ProductOptionUsageAccumuluated {