hs-test: improve test infra

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

diff --git a/extras/hs-test/hst_suite.go b/extras/hs-test/hst_suite.go
index 24b4fc2..1180f07 100644 (file)
--- a/extras/hs-test/hst_suite.go
+++ b/extras/hs-test/hst_suite.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+       "flag"
        "fmt"
        "io/ioutil"
        "os"
@@ -12,20 +13,14 @@ import (
 )
 
 const (
-       defaultNamespaceName string = "default"
+       defaultNetworkNumber int = 1
 )
 
-func IsPersistent() bool {
-       return os.Getenv("HST_PERSIST") == "1"
-}
-
-func IsVerbose() bool {
-       return os.Getenv("HST_VERBOSE") == "1"
-}
+var IsPersistent = flag.Bool("persist", false, "persists topology config")
+var IsVerbose = flag.Bool("verbose", false, "verbose test output")
 
 type HstSuite struct {
        suite.Suite
-       teardownSuite func()
        containers    map[string]*Container
        volumes       []string
        netConfigs    []NetConfig
@@ -34,15 +29,11 @@ type HstSuite struct {
 }
 
 func (s *HstSuite) TearDownSuite() {
-       if s.teardownSuite != nil {
-               s.teardownSuite() // TODO remove this after config moved to SetupTest() for each suite
-       }
-
        s.unconfigureNetworkTopology()
 }
 
 func (s *HstSuite) TearDownTest() {
-       if IsPersistent() {
+       if *IsPersistent {
                return
        }
        s.ResetContainers()
@@ -110,8 +101,14 @@ func (s *HstSuite) assertNotContains(testString, contains interface{}, msgAndArg
        }
 }
 
+func (s *HstSuite) assertNotEmpty(object interface{}, msgAndArgs ...interface{}) {
+       if !assert.NotEmpty(s.T(), object, msgAndArgs...) {
+               s.hstFail()
+       }
+}
+
 func (s *HstSuite) log(args ...any) {
-       if IsVerbose() {
+       if *IsVerbose {
                s.T().Log(args...)
        }
 }
@@ -172,7 +169,6 @@ func (s *HstSuite) loadContainerTopology(topologyName string) {
                if err != nil {
                        s.T().Fatalf("container config error: %v", err)
                }
-               s.log(newContainer.getRunCommand())
                s.containers[newContainer.name] = newContainer
        }
 }
@@ -241,7 +237,7 @@ func (s *HstSuite) configureNetworkTopology(topologyName string) {
 }
 
 func (s *HstSuite) unconfigureNetworkTopology() {
-       if IsPersistent() {
+       if *IsPersistent {
                return
        }
        for _, nc := range s.netConfigs {
@@ -249,47 +245,48 @@ func (s *HstSuite) unconfigureNetworkTopology() {
        }
 }
 
-type NamespaceAddresses struct {
-       namespace         string
+type NetworkAddresses struct {
+       network           int
        numberOfAddresses int
 }
 
+type AddressCounter = int
+
 type Addresser struct {
-       namespaces []*NamespaceAddresses
-       suite      *HstSuite
+       networks map[int]AddressCounter
+       suite    *HstSuite
 }
 
-func (a *Addresser) AddNamespace(name string) {
-       var newNamespace = &NamespaceAddresses{
-               namespace:         name,
-               numberOfAddresses: 0,
-       }
-       a.namespaces = append(a.namespaces, newNamespace)
+func (a *Addresser) AddNetwork(networkNumber int) {
+       a.networks[networkNumber] = 1
 }
 
-func (a *Addresser) NewIp4Address() (string, error) {
-       return a.NewIp4AddressWithNamespace(defaultNamespaceName)
-}
+func (a *Addresser) NewIp4Address(inputNetworkNumber ...int) (string, error) {
+       var networkNumber int = 0
+       if len(inputNetworkNumber) > 0 {
+               networkNumber = inputNetworkNumber[0]
+       }
 
-func (a *Addresser) NewIp4AddressWithNamespace(namespace string) (string, error) {
-       for i, val := range a.namespaces {
-               if val.namespace != namespace {
-                       continue
-               }
-               if val.numberOfAddresses == 255 {
-                       return "", fmt.Errorf("no available IPv4 addresses")
-               }
-               address := fmt.Sprintf("10.10.%v.%v/24", i, val.numberOfAddresses+1)
-               val.numberOfAddresses++
-               return address, nil
+       if _, ok := a.networks[networkNumber]; !ok {
+               a.AddNetwork(networkNumber)
        }
-       a.AddNamespace(namespace)
-       return a.NewIp4AddressWithNamespace(namespace)
+
+       numberOfAddresses := a.networks[networkNumber]
+
+       if numberOfAddresses == 254 {
+               return "", fmt.Errorf("no available IPv4 addresses")
+       }
+
+       address := fmt.Sprintf("10.10.%v.%v/24", networkNumber, numberOfAddresses)
+       a.networks[networkNumber] = numberOfAddresses + 1
+
+       return address, nil
 }
 
 func NewAddresser(suite *HstSuite) *Addresser {
        var addresser = new(Addresser)
        addresser.suite = suite
-       addresser.AddNamespace(defaultNamespaceName)
+       addresser.networks = make(map[int]AddressCounter)
+       addresser.AddNetwork(0)
        return addresser
 }