hsa: use common app session interface in echo tests

[vpp.git] / extras / hs-test / topo.go

diff --git a/extras/hs-test/topo.go b/extras/hs-test/topo.go
index b7e883b..6cb2945 100644 (file)
--- a/extras/hs-test/topo.go
+++ b/extras/hs-test/topo.go
@@ -2,11 +2,6 @@ package main
 
 import (
        "fmt"
-       "io/ioutil"
-       "os"
-       "strings"
-
-       "gopkg.in/yaml.v3"
 )
 
 type NetDevConfig map[string]interface{}
@@ -19,7 +14,7 @@ type YamlTopology struct {
        Volumes    []VolumeConfig    `yaml:"volumes"`
 }
 
-func AddAddress(device, address, ns string) error {
+func addAddress(device, address, ns string) error {
        c := []string{"ip", "addr", "add", address, "dev", device}
        cmd := appendNetns(c, ns)
        err := cmd.Run()
@@ -28,52 +23,3 @@ func AddAddress(device, address, ns string) error {
        }
        return nil
 }
-
-func convertToNetConfig(t *YamlTopology) (*NetTopology, error) {
-       var topology NetTopology
-       for _, dev := range t.Devices {
-               topology = append(topology, NewNetConfig(dev))
-       }
-       return &topology, nil
-}
-
-func loadTopoFile(topoName string) (*NetTopology, error) {
-       var yamlTopo YamlTopology
-
-       data, err := ioutil.ReadFile(topoName)
-       if err != nil {
-               return nil, fmt.Errorf("read error: %v", err)
-       }
-
-       err = yaml.Unmarshal(data, &yamlTopo)
-       if err != nil {
-               return nil, fmt.Errorf("error parsing topology data: %v", err)
-       }
-
-       return convertToNetConfig(&yamlTopo)
-}
-
-func LoadTopology(path, topoName string) (*NetTopology, error) {
-       dir, err := os.Open(path)
-       if err != nil {
-               return nil, err
-       }
-       defer dir.Close()
-
-       files, err := dir.Readdir(0)
-       if err != nil {
-               return nil, err
-       }
-
-       for i := range files {
-               file := files[i]
-               fileName := file.Name()
-
-               // cut off file extension
-               f := strings.Split(fileName, ".")[0]
-               if f == topoName {
-                       return loadTopoFile(path + fileName)
-               }
-       }
-       return nil, fmt.Errorf("topology '%s' not found", topoName)
-}