summaryrefslogtreecommitdiffhomepage
path: root/dhcpv4
diff options
context:
space:
mode:
authorEmanuele Fia <name29@fb.com>2022-08-19 19:53:24 +0200
committerEmanuele Fia <name29@fb.com>2022-08-22 09:08:07 +0200
commita8830ad2a07d0087aba9b263e6963bb03be9bb4f (patch)
tree66acd42d6620fb80efeb1536dfa9cbf03f073c8d /dhcpv4
parent2a691a334f6a296f8be54357782002165dcdaa33 (diff)
Adding support for more circuit id
Signed-off-by: Emanuele Fia <name29@fb.com>
Diffstat (limited to 'dhcpv4')
-rw-r--r--dhcpv4/ztpv4/parse_circuitid.go2
-rw-r--r--dhcpv4/ztpv4/parse_circuitid_test.go2
2 files changed, 4 insertions, 0 deletions
diff --git a/dhcpv4/ztpv4/parse_circuitid.go b/dhcpv4/ztpv4/parse_circuitid.go
index 13852ea..42f7647 100644
--- a/dhcpv4/ztpv4/parse_circuitid.go
+++ b/dhcpv4/ztpv4/parse_circuitid.go
@@ -37,6 +37,8 @@ var circuitRegexs = []*regexp.Regexp{
regexp.MustCompile("^Ethernet(?P<slot>[0-9]+)/(?P<port>[0-9]+)$"),
// Juniper bundle interface ae52.0
regexp.MustCompile("^ae(?P<port>[0-9]+).(?P<subport>[0-9])$"),
+ // Ciena interface format
+ regexp.MustCompile(`\.OSC(-[0-9]+)?-(?P<slot>[0-9]+)-(?P<port>[0-9]+)$`),
}
// ParseCircuitID will parse dhcpv4 packet and return CircuitID info
diff --git a/dhcpv4/ztpv4/parse_circuitid_test.go b/dhcpv4/ztpv4/parse_circuitid_test.go
index cec7403..695d331 100644
--- a/dhcpv4/ztpv4/parse_circuitid_test.go
+++ b/dhcpv4/ztpv4/parse_circuitid_test.go
@@ -89,6 +89,8 @@ func TestParseCircuitID(t *testing.T) {
{name: "Juniper Bundle Pattern", circuit: []byte("ae52.0"), want: &CircuitID{Port: "52", SubPort: "0"}},
{name: "Arista Vlan pattern 1 with circuitid type and length", circuit: []byte("\x00\x0fEthernet14:2001"), want: &CircuitID{Port: "14", Vlan: "2001"}},
{name: "juniperEX pattern", circuit: []byte("ge-0/0/0.0:RANDOMCHAR"), want: &CircuitID{Slot: "0", Module: "0", Port: "0", SubPort: "0"}},
+ {name: "Ciena pattern 1", circuit: []byte("tt-tt-tttt-6-7.OSC-1-2"), want: &CircuitID{Slot: "1", Port: "2"}},
+ {name: "Ciena pattern 2", circuit: []byte("tt-tt-tttt-6-7.OSC-1-2-3"), want: &CircuitID{Slot: "2", Port: "3"}},
}
for _, tc := range tt {
t.Run(tc.name, func(t *testing.T) {