Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
hs-test: rename address allocator
[vpp.git]
/
extras
/
hs-test
/
netconfig.go
diff --git
a/extras/hs-test/netconfig.go
b/extras/hs-test/netconfig.go
index
6059b7b
..
897be6c
100644
(file)
--- a/
extras/hs-test/netconfig.go
+++ b/
extras/hs-test/netconfig.go
@@
-32,8
+32,8
@@
type (
NetInterface struct {
NetConfigBase
NetInterface struct {
NetConfigBase
-
addresser *Addresse
r
- ip4Address string
// this will have form 10.10.10.1/24
+
ip4AddrAllocator *Ip4AddressAllocato
r
+ ip4Address string
index InterfaceIndex
hwAddress MacAddress
networkNamespace string
index InterfaceIndex
hwAddress MacAddress
networkNamespace string
@@
-72,10
+72,10
@@
var (
}
)
}
)
-func newNetworkInterface(cfg NetDevConfig, a *
Addresse
r) (*NetInterface, error) {
+func newNetworkInterface(cfg NetDevConfig, a *
Ip4AddressAllocato
r) (*NetInterface, error) {
var newInterface *NetInterface = &NetInterface{}
var err error
var newInterface *NetInterface = &NetInterface{}
var err error
- newInterface.
addresse
r = a
+ newInterface.
ip4AddrAllocato
r = a
newInterface.name = cfg["name"].(string)
newInterface.networkNumber = DEFAULT_NETWORK_NUM
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)
}
if n, ok := ip.(NetDevConfig)["network"]; ok {
newInterface.networkNumber = n.(int)
}
- newInterface.ip4Address, err = newInterface.
addresser.newIp4
Address(
+ newInterface.ip4Address, err = newInterface.
ip4AddrAllocator.NewIp4Interface
Address(
newInterface.networkNumber,
)
if err != nil {
newInterface.networkNumber,
)
if err != nil {