FixResourcesCode() (#21)

pkg/collector/collector.go

@@ -8,8 +8,6 @@ package collector
 
 import (
 	"fmt"
-
-	nsx "github.com/np-guard/vmware-analyzer/pkg/model/generated"
 )
 
 const (
@@ -37,7 +35,6 @@ type serverData struct {
 func CollectResources(nsxServer, userName, password string) (*ResourcesContainerModel, error) {
 	server := serverData{nsxServer, userName, password}
 	res := NewResourcesContainerModel()
-	nsx.FixResourcesCode()
 	err := collectResultList(server, virtualMachineQuery, &res.VirtualMachineList)
 	if err != nil {
 		return nil, err

pkg/collector/collector_test.go

@@ -97,8 +97,10 @@ func TestCollectResources(t *testing.T) {
 								for _, e := range s.ServiceEntries {
 									_, err := e.ToConnection()
 									if err != nil {
-										t.Errorf("fail to create rule service entry error = %v", err)
-										return
+										if !strings.Contains(err.Error(), "protocol ICMPv6 of ICMPTypeServiceEntry") {
+											t.Errorf("fail to create rule service entry error = %v", err)
+											return
+										}
 									}
 								}
 							}

pkg/collector/resources_container_model.go

@@ -9,6 +9,8 @@ package collector
 import (
 	"encoding/json"
 	"slices"
+
+	nsx "github.com/np-guard/vmware-analyzer/pkg/model/generated"
 )
 
 // ResourcesContainerModel defines the model of a container for all resource types we can collect
@@ -28,6 +30,7 @@ type DomainResources struct {
 
 // NewResourcesContainerModel creates an empty resources container
 func NewResourcesContainerModel() *ResourcesContainerModel {
+	nsx.FixResourcesCode()
 	return &ResourcesContainerModel{}
 }
 
@@ -38,9 +41,9 @@ func (resources *ResourcesContainerModel) ToJSONString() (string, error) {
 }
 
 func FromJSONString(b []byte) (*ResourcesContainerModel, error) {
-	var resources ResourcesContainerModel
-	err := json.Unmarshal(b, &resources)
-	return &resources, err
+	resources := NewResourcesContainerModel()
+	err := json.Unmarshal(b, resources)
+	return resources, err
 }
 
 func (resources *DomainResources) GetGroup(query string) *Group {