VOL-1355 BBSim - Support per-ONU control (and remove UNI veths and chhange NNI's veth name)
(UNI veths in BBSim is no longer necessary because DHCP/EAPOL are emulated inside BBSim)
Change-Id: I19aba9fc90dd673c247e70b75130ffd58903f18b
diff --git a/core/io_worker.go b/core/io_worker.go
index 077b2c1..4d885b6 100644
--- a/core/io_worker.go
+++ b/core/io_worker.go
@@ -145,15 +145,9 @@
return hwAddr
}
-func makeUniName(oltid uint32, intfid uint32, onuid uint32) (upif string, dwif string) {
- upif = UNI_VETH_UP_PFX + strconv.Itoa(int(oltid)) + "_" + strconv.Itoa(int(intfid)) + "_" + strconv.Itoa(int(onuid))
- dwif = UNI_VETH_DW_PFX + strconv.Itoa(int(oltid)) + "_" + strconv.Itoa(int(intfid)) + "_" + strconv.Itoa(int(onuid))
- return
-}
-
func makeNniName(oltid uint32) (upif string, dwif string) {
- upif = NNI_VETH_UP_PFX + strconv.Itoa(int(oltid))
- dwif = NNI_VETH_DW_PFX + strconv.Itoa(int(oltid))
+ upif = NNI_VETH_NORTH_PFX + strconv.Itoa(int(oltid))
+ dwif = NNI_VETH_SOUTH_PFX + strconv.Itoa(int(oltid))
return
}