3 files changed, 10 insertions, 9 deletions
diff --git a/server/server.go b/server/server.go
index 70cafeaa..8a3b8f83 100644
--- a/server/server.go
+++ b/server/server.go
@@ -673,7 +673,7 @@ func (server *BgpServer) broadcastValidationResults(results []*api.ROAResult) {
 
 func (server *BgpServer) broadcastBests(bests []*table.Path) {
 	for _, path := range bests {
-		if !path.IsFromZebra() {
+		if !path.IsFromExternal() {
 			z := newBroadcastZapiBestMsg(server.zclient, path)
 			if z != nil {
 				server.broadcastMsgs = append(server.broadcastMsgs, z)
@@ -1437,8 +1437,9 @@ func (server *BgpServer) Api2PathList(resource api.Resource, name string, ApiPat
 		if len(extcomms) > 0 {
 			pattr = append(pattr, bgp.NewPathAttributeExtendedCommunities(extcomms))
 		}
-
-		paths = append(paths, table.NewPath(pi, nlri, path.IsWithdraw, pattr, time.Now(), path.NoImplicitWithdraw, path.IsFromOps))
+		newPath := table.NewPath(pi, nlri, path.IsWithdraw, pattr, time.Now(), path.NoImplicitWithdraw)
+		newPath.SetIsFromExternal(path.IsFromExternal)
+		paths = append(paths, newPath)
 
 	}
 	return paths, nil
diff --git a/server/zclient.go b/server/zclient.go
index a6427781..6cf0af4f 100644
--- a/server/zclient.go
+++ b/server/zclient.go
@@ -127,8 +127,8 @@ func createPathFromIPRouteMessage(m *zebra.Message, peerInfo *table.PeerInfo) *t
 	med := bgp.NewPathAttributeMultiExitDisc(body.Metric)
 	pattr = append(pattr, med)
 
-	p := table.NewPath(peerInfo, nlri, isWithdraw, pattr, time.Now(), false, false)
-	p.SetIsFromZebra(true)
+	p := table.NewPath(peerInfo, nlri, isWithdraw, pattr, time.Now(), false)
+	p.SetIsFromExternal(true)
 	return p
 }
 
diff --git a/server/zclient_test.go b/server/zclient_test.go
index 2fbd7554..a09b59e6 100644
--- a/server/zclient_test.go
+++ b/server/zclient_test.go
@@ -59,7 +59,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
 	assert.NotEqual(nil, p)
 	assert.Equal("0.0.0.0", p.GetNexthop().String())
 	assert.Equal("192.168.100.0/24", p.GetNlri().String())
-	assert.True(p.IsFromZebra())
+	assert.True(p.IsFromExternal())
 	assert.False(p.IsWithdraw)
 
 	// withdraw
@@ -71,7 +71,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
 	assert.Equal("192.168.100.0/24", p.GetNlri().String())
 	med, _ := p.GetMed()
 	assert.Equal(uint32(100), med)
-	assert.True(p.IsFromZebra())
+	assert.True(p.IsFromExternal())
 	assert.True(p.IsWithdraw)
 
 	// IPv6
@@ -88,7 +88,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
 	assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String())
 	med, _ = p.GetMed()
 	assert.Equal(uint32(100), med)
-	assert.True(p.IsFromZebra())
+	assert.True(p.IsFromExternal())
 	assert.False(p.IsWithdraw)
 
 	// withdraw
@@ -98,7 +98,7 @@ func Test_createPathFromIPRouteMessage(t *testing.T) {
 	assert.NotEqual(nil, p)
 	assert.Equal("::", p.GetNexthop().String())
 	assert.Equal("2001:db8:0:f101::/64", p.GetNlri().String())
-	assert.True(p.IsFromZebra())
+	assert.True(p.IsFromExternal())
 	assert.True(p.IsWithdraw)
 
 }