Shorten the 7750 vendor name

diff --git a/share/dictionary/dhcpv6/dictionary.nokia.sr b/share/dictionary/dhcpv6/dictionary.nokia.sr
index 4f2f992659cd15781de21cd0620ee8ce811bd6e5..61780f41f907b74899f1b4a5d1ce8f02152bd6eb 100644 (file)
--- a/share/dictionary/dhcpv6/dictionary.nokia.sr
+++ b/share/dictionary/dhcpv6/dictionary.nokia.sr
@@ -15,12 +15,12 @@
 #
 ##############################################################################
 
-VENDOR         Nokia-Service-Router            6527
-BEGIN-VENDOR   Nokia-Service-Router
+VENDOR         Nokia-SR                6527
+BEGIN-VENDOR   Nokia-SR
 
 ATTRIBUTE      WAN-Pool                                1       string
 ATTRIBUTE      PFX-Pool                                2       string
 ATTRIBUTE      PFX-Len                                 3       uint8
 ATTRIBUTE      Reserved-NA-Len                         4       uint8
 
-END-VENDOR Nokia-Service-Router
+END-VENDOR Nokia-SR

diff --git a/share/dictionary/radius/dictionary.nokia.sr b/share/dictionary/radius/dictionary.nokia.sr
index ca9bba0289966e5278156e6e058d770034b75841..6ce979dce1cf7dbe954bebd3f06d194d62104e03 100644 (file)
--- a/share/dictionary/radius/dictionary.nokia.sr
+++ b/share/dictionary/radius/dictionary.nokia.sr
@@ -13,9 +13,9 @@
 #
 ##############################################################################
 
-VENDOR         Nokia-Service-Router            6527
+VENDOR         Nokia-SR                6527
 
-BEGIN-VENDOR   Nokia-Service-Router
+BEGIN-VENDOR   Nokia-SR
 
 # Alcatel Timetra attributes
 ATTRIBUTE      Timetra-Access                          1       integer
@@ -524,4 +524,4 @@ ATTRIBUTE   Dhcp6-Rebind-Time                       203     integer
 # in both authentication and accounting
 ATTRIBUTE      Wlan-SSID-VLAN                          206     string
 
-END-VENDOR     Nokia-Service-Router
+END-VENDOR     Nokia-SR

diff --git a/src/tests/keywords/map-xlat b/src/tests/keywords/map-xlat
index 907c8026e941cf28bc8d00780e0f522493a20823..884a7bf5599efa66f8106b939cdddb45ded0be06 100644 (file)
--- a/src/tests/keywords/map-xlat
+++ b/src/tests/keywords/map-xlat
@@ -5,8 +5,8 @@
 #
 update {
        &Tmp-String-0 := '&control.Tmp-String-0 := \'testing123\''
-       &Tmp-String-1 := "request.Vendor-Specific.Nokia-Service-Router.MSAP-Interface = 'UNICAST_7360OLT3'"
-       &Tmp-String-1 += "request.Vendor-Specific.Nokia-Service-Router.MSAP-Interface += 'UNICAST_7360OLT4'"
+       &Tmp-String-1 := "request.Vendor-Specific.Nokia-SR.MSAP-Interface = 'UNICAST_7360OLT3'"
+       &Tmp-String-1 += "request.Vendor-Specific.Nokia-SR.MSAP-Interface += 'UNICAST_7360OLT4'"
 }
 
 if ("%{map:%{Tmp-String-0}}" != 1) {
@@ -23,11 +23,11 @@ foreach &Tmp-String-1[*] {
        }
 }
 
-if (&request.Vendor-Specific.Nokia-Service-Router.MSAP-Interface[0] != 'UNICAST_7360OLT3') {
+if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[0] != 'UNICAST_7360OLT3') {
        test_fail
 }
 
-if (&request.Vendor-Specific.Nokia-Service-Router.MSAP-Interface[1] != 'UNICAST_7360OLT4') {
+if (&request.Vendor-Specific.Nokia-SR.MSAP-Interface[1] != 'UNICAST_7360OLT4') {
        test_fail
 }
 

diff --git a/src/tests/unit/protocols/dhcpv6/relay_forward.txt b/src/tests/unit/protocols/dhcpv6/relay_forward.txt
index 9d60b827314a10efe90c86831f2fd55a64fa3f34..1726c65627e6812abfcb14eb272c3d7b37e12bd9 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/relay_forward.txt
+++ b/src/tests/unit/protocols/dhcpv6/relay_forward.txt
@@ -11,7 +11,7 @@ proto dhcpv6
 proto-dictionary dhcpv6
 
 decode-proto 0c0126058600000680000000000000000000fe80000000000000025056fffea353fe000900c40c0000000000000000000000000000000000fe80000000000000025056fffea353fe0012001c4c41424f4c54322065746820312f312f30352f30312f32382f312f310009007e011141d70001000e0001000126b1b7f1005056a353fe0012001c4c41424f4c54322065746820312f312f30352f30312f32382f312f310006000200180008000200000003002856a353fe00000e1000001518000500182605860000064000000000000000000100001c2000002a300019000c56a353fe00000e1000001518002500120000197f0001000126b1b7f1005056a353fe0011002a0000197f0001000a4c41424f4c54322d6e610002000a4c41424f4c54322d7064000300013f0004000140
-match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = Ethernet, Client-ID.DUID.LLT.Time = "Jul 27 2020 16:06:09 UTC", Client-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:50:56:a3:53:fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA.IAID = 1453544446, IA-NA.T1 = 3600, IA-NA.T2 = 5400, IA-NA.Options = { IA-Addr.IPv6-Address = 2605:8600:6:4000::1, IA-Addr.Preferred-Lifetime = 7200, IA-Addr.Valid-Lifetime = 10800 }, IA-PD.IAID = 1453544446, IA-PD.T1 = 3600, IA-PD.T2 = 5400 } }, Relay-Agent-Remote-ID.Vendor = 6527, Relay-Agent-Remote-ID.Value = 0x0001000126b1b7f1005056a353fe, Vendor-Opts.Nokia-Service-Router.WAN-Pool = "LABOLT2-na", Vendor-Opts.Nokia-Service-Router.PFX-Pool = "LABOLT2-pd", Vendor-Opts.Nokia-Service-Router.PFX-Len = 63, Vendor-Opts.Nokia-Service-Router.Reserved-NA-Len = 64
+match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = Ethernet, Client-ID.DUID.LLT.Time = "Jul 27 2020 16:06:09 UTC", Client-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:50:56:a3:53:fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA.IAID = 1453544446, IA-NA.T1 = 3600, IA-NA.T2 = 5400, IA-NA.Options = { IA-Addr.IPv6-Address = 2605:8600:6:4000::1, IA-Addr.Preferred-Lifetime = 7200, IA-Addr.Valid-Lifetime = 10800 }, IA-PD.IAID = 1453544446, IA-PD.T1 = 3600, IA-PD.T2 = 5400 } }, Relay-Agent-Remote-ID.Vendor = 6527, Relay-Agent-Remote-ID.Value = 0x0001000126b1b7f1005056a353fe, Vendor-Opts.Nokia-SR.WAN-Pool = "LABOLT2-na", Vendor-Opts.Nokia-SR.PFX-Pool = "LABOLT2-pd", Vendor-Opts.Nokia-SR.PFX-Len = 63, Vendor-Opts.Nokia-SR.Reserved-NA-Len = 64
 
 encode-proto -
 match 0c 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 09 00 c4 0c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 09 00 7e 01 11 41 d7 00 01 00 0e 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 06 00 02 00 18 00 08 00 02 00 00 00 03 00 28 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 05 00 18 26 05 86 00 00 06 40 00 00 00 00 00 00 00 00 01 00 00 1c 20 00 00 2a 30 00 19 00 0c 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 25 00 12 00 00 19 7f 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 11 00 12 00 00 19 7f 00 01 00 0a 4c 41 42 4f 4c 54 32 2d 6e 61 00 11 00 12 00 00 19 7f 00 02 00 0a 4c 41 42 4f 4c 54 32 2d 70 64 00 11 00 09 00 00 19 7f 00 03 00 01 3f 00 11 00 09 00 00 19 7f 00 04 00 01 40
@@ -20,7 +20,7 @@ match 0c 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00
 #  Yes, this is exactly the same massive text blob as above. :)
 #
 decode-proto -
-match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = Ethernet, Client-ID.DUID.LLT.Time = "Jul 27 2020 16:06:09 UTC", Client-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:50:56:a3:53:fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA.IAID = 1453544446, IA-NA.T1 = 3600, IA-NA.T2 = 5400, IA-NA.Options = { IA-Addr.IPv6-Address = 2605:8600:6:4000::1, IA-Addr.Preferred-Lifetime = 7200, IA-Addr.Valid-Lifetime = 10800 }, IA-PD.IAID = 1453544446, IA-PD.T1 = 3600, IA-PD.T2 = 5400 } }, Relay-Agent-Remote-ID.Vendor = 6527, Relay-Agent-Remote-ID.Value = 0x0001000126b1b7f1005056a353fe, Vendor-Opts.Nokia-Service-Router.WAN-Pool = "LABOLT2-na", Vendor-Opts.Nokia-Service-Router.PFX-Pool = "LABOLT2-pd", Vendor-Opts.Nokia-Service-Router.PFX-Len = 63, Vendor-Opts.Nokia-Service-Router.Reserved-NA-Len = 64
+match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = Ethernet, Client-ID.DUID.LLT.Time = "Jul 27 2020 16:06:09 UTC", Client-ID.DUID.LLT.Hardware-Type.Ethernet.Address = 00:50:56:a3:53:fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA.IAID = 1453544446, IA-NA.T1 = 3600, IA-NA.T2 = 5400, IA-NA.Options = { IA-Addr.IPv6-Address = 2605:8600:6:4000::1, IA-Addr.Preferred-Lifetime = 7200, IA-Addr.Valid-Lifetime = 10800 }, IA-PD.IAID = 1453544446, IA-PD.T1 = 3600, IA-PD.T2 = 5400 } }, Relay-Agent-Remote-ID.Vendor = 6527, Relay-Agent-Remote-ID.Value = 0x0001000126b1b7f1005056a353fe, Vendor-Opts.Nokia-SR.WAN-Pool = "LABOLT2-na", Vendor-Opts.Nokia-SR.PFX-Pool = "LABOLT2-pd", Vendor-Opts.Nokia-SR.PFX-Len = 63, Vendor-Opts.Nokia-SR.Reserved-NA-Len = 64
 
 count
 match 8