hs-test: clean-up ip address generation

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

diff --git a/extras/hs-test/vppinstance.go b/extras/hs-test/vppinstance.go
index dfaf405..4bb7261 100644 (file)
--- a/extras/hs-test/vppinstance.go
+++ b/extras/hs-test/vppinstance.go
@@ -60,10 +60,10 @@ const (
 )
 
 type VppInstance struct {
-       container      *Container
-       additionalConfig  Stanza
-       connection     *core.Connection
-       apiChannel     api.Channel
+       container        *Container
+       additionalConfig Stanza
+       connection       *core.Connection
+       apiChannel       api.Channel
 }
 
 func (vpp *VppInstance) Suite() *HstSuite {
@@ -96,11 +96,11 @@ func (vpp *VppInstance) start() error {
 
        // Create startup.conf inside the container
        configContent := fmt.Sprintf(
-                vppConfigTemplate,
-                containerWorkDir,
-                defaultCliSocketFilePath,
-                defaultApiSocketFilePath,
-        )
+               vppConfigTemplate,
+               containerWorkDir,
+               defaultCliSocketFilePath,
+               defaultApiSocketFilePath,
+       )
        configContent += vpp.additionalConfig.ToString()
        startupFileName := vpp.getEtcDir() + "/startup.conf"
        vpp.container.createFile(startupFileName, configContent)
@@ -166,7 +166,7 @@ func (vpp *VppInstance) waitForApp(appName string, timeout int) error {
 func (vpp *VppInstance) createAfPacket(
        netInterface NetInterface,
 ) (interface_types.InterfaceIndex, error) {
-        veth := netInterface.(*NetworkInterfaceVeth)
+       veth := netInterface.(*NetworkInterfaceVeth)
 
        createReq := &af_packet.AfPacketCreateV2{
                UseRandomHwAddr: true,
@@ -198,14 +198,7 @@ func (vpp *VppInstance) createAfPacket(
        if veth.AddressWithPrefix() == (AddressWithPrefix{}) {
                var err error
                var ip4Address string
-               if veth.peerNetworkNamespace != "" {
-                       ip4Address, err = veth.addresser.
-                               NewIp4AddressWithNamespace(veth.peerNetworkNamespace)
-               } else {
-                       ip4Address, err = veth.addresser.
-                               NewIp4Address()
-               }
-               if err == nil {
+               if ip4Address, err = veth.addresser.NewIp4Address(veth.peerNetworkNumber); err == nil {
                        veth.SetAddress(ip4Address)
                } else {
                        return 0, err