Merge branch 167-a-requested-device-via-grpc-is-missing-sbi with...

Merge branch 167-a-requested-device-via-grpc-is-missing-sbi with refs/heads/develop into refs/merge-requests/248/train

northbound/server/pnd.go

@@ -121,10 +121,18 @@ func fillOnds(pnd networkdomain.NetworkDomain, all bool, did ...string) ([]*ppb.
 			log.Error(err)
 			return nil, status.Errorf(codes.Aborted, "%v", err)
 		}
+
+		sbi := spb.SouthboundInterface{}
+		if d.SBI() != nil {
+			sbi.Id = d.SBI().ID().String()
+			sbi.Type = d.SBI().Type()
+		}
+
 		onds[i] = &ppb.OrchestratedNetworkingDevice{
 			Id:     id,
 			Name:   d.Name(),
 			Device: dev,
+			Sbi:    &sbi,
 		}
 	}
 

nucleus/principalNetworkDomain.go

@@ -217,7 +217,7 @@ func (pnd *pndImplementation) GetDevice(identifier string) (device.Device, error
 		return nil, err
 	}
 
-	copiedDevice := &CommonDevice{name: d.Name(), UUID: d.ID(), GoStruct: copiedGoStruct}
+	copiedDevice := &CommonDevice{name: d.Name(), UUID: d.ID(), GoStruct: copiedGoStruct, sbi: d.SBI()}
 
 	return copiedDevice, nil
 }