From 3a910ab76800b9608b05e6b188730a2290b51ae0 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Thu, 8 Jun 2023 17:39:39 +0200 Subject: hs-test: rename address allocator Type: test Change-Id: I1745719315d4e0785df5a03aa4312f84c40cb18f Signed-off-by: Filip Tehlar --- extras/hs-test/netconfig.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'extras/hs-test/netconfig.go') diff --git a/extras/hs-test/netconfig.go b/extras/hs-test/netconfig.go index 6059b7b8567..897be6cfa65 100644 --- a/extras/hs-test/netconfig.go +++ b/extras/hs-test/netconfig.go @@ -32,8 +32,8 @@ type ( NetInterface struct { NetConfigBase - addresser *Addresser - ip4Address string // this will have form 10.10.10.1/24 + ip4AddrAllocator *Ip4AddressAllocator + ip4Address string index InterfaceIndex hwAddress MacAddress networkNamespace string @@ -72,10 +72,10 @@ var ( } ) -func newNetworkInterface(cfg NetDevConfig, a *Addresser) (*NetInterface, error) { +func newNetworkInterface(cfg NetDevConfig, a *Ip4AddressAllocator) (*NetInterface, error) { var newInterface *NetInterface = &NetInterface{} var err error - newInterface.addresser = a + newInterface.ip4AddrAllocator = a newInterface.name = cfg["name"].(string) newInterface.networkNumber = DEFAULT_NETWORK_NUM @@ -98,7 +98,7 @@ func newNetworkInterface(cfg NetDevConfig, a *Addresser) (*NetInterface, error) if n, ok := ip.(NetDevConfig)["network"]; ok { newInterface.networkNumber = n.(int) } - newInterface.ip4Address, err = newInterface.addresser.newIp4Address( + newInterface.ip4Address, err = newInterface.ip4AddrAllocator.NewIp4InterfaceAddress( newInterface.networkNumber, ) if err != nil { -- cgit 1.2.3-korg