Enable multiple src/dst IP addresses in Connection Context.

Signed-off-by: Ed Warnicke <hagbard@gmail.com>
networkservicemesh · Oct 1, 2020 · 817aafc · 817aafc
1 parent 93ee44c
commit 817aafc
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 59 deletions.
diff --git a/pkg/api/networkservice/connectioncontext.pb.go b/pkg/api/networkservice/connectioncontext.pb.go
diff --git a/pkg/api/networkservice/connectioncontext.proto b/pkg/api/networkservice/connectioncontext.proto
@@ -46,8 +46,8 @@ message ExtraPrefixRequest {
 }
 
 message IPContext {
-    string src_ip_addr = 1; /* source ip address + prefix in format <address>/<prefix> */
-    string dst_ip_addr = 2; /* destination ip address + prefix in format <address>/<prefix> */
+    repeated string src_ip_addr = 1; /* source ip address + prefix in format <address>/<prefix> */
+    repeated string dst_ip_addr = 2; /* destination ip address + prefix in format <address>/<prefix> */
 
     bool src_ip_required = 3; /* if specified src_ip is required from NSE. */
     bool dst_ip_required = 4; /* if specified dst_ip is required from NSE */

diff --git a/pkg/api/networkservice/connectioncontext_helpers.go b/pkg/api/networkservice/connectioncontext_helpers.go
@@ -64,10 +64,10 @@ func (c *ConnectionContext) MeetsRequirements(original *ConnectionContext) error
 	if err != nil {
 		return err
 	}
-	if original.GetIpContext().GetDstIpRequired() && c.GetIpContext().GetDstIpAddr() == "" {
+	if original.GetIpContext().GetDstIpRequired() && len(c.GetIpContext().GetDstIpAddr()) > 0 {
 		return errors.Errorf("ConnectionContext.DestIp is required and cannot be empty/nil: %v", c)
 	}
-	if original.GetIpContext().GetSrcIpRequired() && c.GetIpContext().GetSrcIpAddr() == "" {
+	if original.GetIpContext().GetSrcIpRequired() && len(c.GetIpContext().GetSrcIpAddr()) > 0 {
 		return errors.Errorf("ConnectionContext.SrcIp is required cannot be empty/nil: %v", c)
 	}