Clean up codex test

Signed-off-by: Sean Holcomb <seanholcomb@gmail.com>

core/pkg/model/kubemodel/kubemodel.go

@@ -25,7 +25,6 @@ type KubeModelSet struct {
 	Pods                   map[string]*Pod                   `json:"pods"`              // @bingen:field[version=2]
 	Containers             map[string]*Container             `json:"containers"`        // @bingen:field[version=2]
 	DCGMDevices            map[string]*DCGMDevice            `json:"dcgmDevices"`       // @bingen:field[version=2]
-	idx                    *kubeModelSetIndexes              // @bingen:field[ignore]
 }
 
 func NewKubeModelSet(start time.Time, end time.Time) *KubeModelSet {
@@ -55,26 +54,10 @@ func NewKubeModelSet(start time.Time, end time.Time) *KubeModelSet {
 		ResourceQuotas:         map[string]*ResourceQuota{},
 		Services:               map[string]*Service{},
 		PersistentVolumes:      map[string]*PersistentVolume{},
-		idx:                    newKubeModelSetIndexes(),
 	}
 	return kms
 }
 
-// GetNamespaceByName retrieves a namespace by its name using the index
-func (kms *KubeModelSet) GetNamespaceByName(name string) (*Namespace, bool) {
-	if kms.idx == nil {
-		return nil, false
-	}
-
-	uid, ok := kms.idx.namespaceNameToID[name]
-	if !ok {
-		return nil, false
-	}
-
-	ns, ok := kms.Namespaces[uid]
-	return ns, ok
-}
-
 // IsEmpty returns true if the KubeModelSet is nil, has no cluster, or contains no resources
 func (kms *KubeModelSet) IsEmpty() bool {
 	if kms == nil || kms.Cluster == nil {
@@ -116,15 +99,3 @@ func checkWindow(window Window, start, end time.Time) error {
 	}
 	return nil
 }
-
-type kubeModelSetIndexes struct {
-	namespaceNameToID map[string]string
-	namespaceByName   map[string]*Namespace
-}
-
-func newKubeModelSetIndexes() *kubeModelSetIndexes {
-	return &kubeModelSetIndexes{
-		namespaceNameToID: make(map[string]string),
-		namespaceByName:   make(map[string]*Namespace),
-	}
-}

core/pkg/model/kubemodel/kubemodel_codecs_test.go

@@ -1,6 +1,7 @@
 package kubemodel
 
 import (
+	"bytes"
 	"testing"
 	"time"
 
@@ -36,4 +37,18 @@ func TestKubeModelSetCodecRoundTrip(t *testing.T) {
 
 		KubeModelSetEquals(t, kms, act)
 	})
+
+	t.Run("full KubeModelSet streaming (MarshalBinaryTo/UnmarshalBinaryFromReader)", func(t *testing.T) {
+		kms := NewMockKubeModelSet(start, end)
+
+		var buf bytes.Buffer
+		err := kms.MarshalBinaryTo(&buf)
+		require.NoError(t, err)
+
+		act := new(KubeModelSet)
+		err = act.UnmarshalBinaryFromReader(&buf)
+		require.NoError(t, err)
+
+		KubeModelSetEquals(t, kms, act)
+	})
 }

core/pkg/model/kubemodel/kubemodel_test.go

@@ -183,8 +183,6 @@ func TestKubeModel(t *testing.T) {
 
 			require.NotNil(t, kms.Namespaces[testUID])
 			require.Equal(t, testNamespace, kms.Namespaces[testUID])
-			require.NotNil(t, kms.idx.namespaceByName[testName])
-			require.Equal(t, testNamespace, kms.idx.namespaceByName[testName])
 			require.Equal(t, 1, kms.Metadata.ObjectCount)
 		})
 
@@ -209,7 +207,6 @@ func TestKubeModel(t *testing.T) {
 			testNamespace := &Namespace{UID: testUID, Name: testName, Start: start, End: end}
 
 			require.Equal(t, testNamespace, kms.Namespaces[testUID])
-			require.Equal(t, testNamespace, kms.idx.namespaceByName[testName])
 			require.Equal(t, 1, kms.Metadata.ObjectCount)
 
 			// Register same namespace again, expect no-op on second try
@@ -219,7 +216,6 @@ func TestKubeModel(t *testing.T) {
 			require.Len(t, kms.GetErrors(), 0)
 			require.NotNil(t, kms.Namespaces[testUID])
 			require.Equal(t, testNamespace, kms.Namespaces[testUID])
-			require.Equal(t, testNamespace, kms.idx.namespaceByName[testName])
 			require.Equal(t, 1, kms.Metadata.ObjectCount) // remains 1
 		})
 	})

core/pkg/model/kubemodel/namespace.go

@@ -47,9 +47,6 @@ func (kms *KubeModelSet) RegisterNamespace(namespace *Namespace) error {
 		}
 
 		kms.Namespaces[namespace.UID] = namespace
-
-		kms.idx.namespaceByName[namespace.Name] = namespace
-
 		kms.Metadata.ObjectCount++
 	}