From 3fad3e431eb386864772703b2fcace9f0b3fb52f Mon Sep 17 00:00:00 2001
From: Fabian Helm <fabian.helm@stud.h-da.de>
Date: Thu, 3 Feb 2022 12:03:18 +0100
Subject: [PATCH] new generation
---
go/gosdn/pnd/pnd.pb.go | 8 ++++----
openapiv2/gosdn_northbound.swagger.json | 11 +++++++----
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/go/gosdn/pnd/pnd.pb.go b/go/gosdn/pnd/pnd.pb.go
index 8148794..f9fd57f 100644
--- a/go/gosdn/pnd/pnd.pb.go
+++ b/go/gosdn/pnd/pnd.pb.go
@@ -797,8 +797,8 @@ type GetSbiResponse struct {
Timestamp int64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` // Timestamp in nanoseconds since Epoch.
// TODO: Check if this is really needed. Perhaps a reference to the PND's ID
// is also sufficient.
- Pnd *PrincipalNetworkDomain `protobuf:"bytes,2,opt,name=pnd,proto3" json:"pnd,omitempty"`
- Sbi *southbound.SouthboundInterface `protobuf:"bytes,3,opt,name=sbi,proto3" json:"sbi,omitempty"`
+ Pnd *PrincipalNetworkDomain `protobuf:"bytes,2,opt,name=pnd,proto3" json:"pnd,omitempty"`
+ Sbi []*southbound.SouthboundInterface `protobuf:"bytes,3,rep,name=sbi,proto3" json:"sbi,omitempty"`
}
func (x *GetSbiResponse) Reset() {
@@ -847,7 +847,7 @@ func (x *GetSbiResponse) GetPnd() *PrincipalNetworkDomain {
return nil
}
-func (x *GetSbiResponse) GetSbi() *southbound.SouthboundInterface {
+func (x *GetSbiResponse) GetSbi() []*southbound.SouthboundInterface {
if x != nil {
return x.Sbi
}
@@ -2361,7 +2361,7 @@ var file_gosdn_pnd_pnd_proto_rawDesc = []byte{
0x28, 0x0b, 0x32, 0x21, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e, 0x70, 0x6e, 0x64, 0x2e, 0x50,
0x72, 0x69, 0x6e, 0x63, 0x69, 0x70, 0x61, 0x6c, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x44,
0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x52, 0x03, 0x70, 0x6e, 0x64, 0x12, 0x37, 0x0a, 0x03, 0x73, 0x62,
- 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e,
+ 0x69, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x67, 0x6f, 0x73, 0x64, 0x6e, 0x2e,
0x73, 0x6f, 0x75, 0x74, 0x68, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x2e, 0x53, 0x6f, 0x75, 0x74, 0x68,
0x62, 0x6f, 0x75, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x52, 0x03,
0x73, 0x62, 0x69, 0x22, 0xa0, 0x01, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x53, 0x62, 0x69, 0x4c, 0x69,
diff --git a/openapiv2/gosdn_northbound.swagger.json b/openapiv2/gosdn_northbound.swagger.json
index 0d7b4e6..618512d 100644
--- a/openapiv2/gosdn_northbound.swagger.json
+++ b/openapiv2/gosdn_northbound.swagger.json
@@ -21,16 +21,16 @@
"name": "gNMI"
},
{
- "name": "AgentManager"
+ "name": "CoreService"
},
{
"name": "CsbiService"
},
{
- "name": "Collector"
+ "name": "AgentManager"
},
{
- "name": "CoreService"
+ "name": "Collector"
}
],
"consumes": [
@@ -2205,7 +2205,10 @@
"description": "TODO: Check if this is really needed. Perhaps a reference to the PND's ID\nis also sufficient."
},
"sbi": {
- "$ref": "#/definitions/southboundSouthboundInterface"
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/southboundSouthboundInterface"
+ }
}
}
},
--
GitLab