v6: add ServerID getter

Signed-off-by: Chris Koch <chrisko@google.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/dhcpv6/option_serverid_test.go b/dhcpv6/option_serverid_test.go
index 23c00f5..05158c4 100644
--- a/dhcpv6/option_serverid_test.go
+++ b/dhcpv6/option_serverid_test.go
@@ -8,27 +8,27 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestParseOptServerId(t *testing.T) {
+func TestParseOptServerID(t *testing.T) {
 	data := []byte{
 		0, 3, // DUID_LL
 		0, 1, // hwtype ethernet
 		0, 1, 2, 3, 4, 5, // hw addr
 	}
-	opt, err := ParseOptServerId(data)
+	opt, err := parseOptServerID(data)
 	require.NoError(t, err)
-	require.Equal(t, DUID_LL, opt.Sid.Type)
-	require.Equal(t, iana.HWTypeEthernet, opt.Sid.HwType)
-	require.Equal(t, net.HardwareAddr([]byte{0, 1, 2, 3, 4, 5}), opt.Sid.LinkLayerAddr)
+	require.Equal(t, DUID_LL, opt.Type)
+	require.Equal(t, iana.HWTypeEthernet, opt.HwType)
+	require.Equal(t, net.HardwareAddr{0, 1, 2, 3, 4, 5}, opt.LinkLayerAddr)
 }
 
 func TestOptServerIdToBytes(t *testing.T) {
-	opt := OptServerId{
-		Sid: Duid{
+	opt := OptServerID(
+		Duid{
 			Type:          DUID_LL,
 			HwType:        iana.HWTypeEthernet,
-			LinkLayerAddr: net.HardwareAddr([]byte{5, 4, 3, 2, 1, 0}),
+			LinkLayerAddr: net.HardwareAddr{5, 4, 3, 2, 1, 0},
 		},
-	}
+	)
 	expected := []byte{
 		0, 3, // DUID_LL
 		0, 1, // hwtype ethernet
@@ -43,42 +43,42 @@ func TestOptServerIdDecodeEncode(t *testing.T) {
 		0, 1, // hwtype ethernet
 		5, 4, 3, 2, 1, 0, // hw addr
 	}
-	opt, err := ParseOptServerId(data)
+	opt, err := parseOptServerID(data)
 	require.NoError(t, err)
 	require.Equal(t, data, opt.ToBytes())
 }
 
 func TestOptionServerId(t *testing.T) {
-	opt := OptServerId{
-		Sid: Duid{
+	opt := OptServerID(
+		Duid{
 			Type:          DUID_LL,
 			HwType:        iana.HWTypeEthernet,
-			LinkLayerAddr: net.HardwareAddr([]byte{0xde, 0xad, 0, 0, 0xbe, 0xef}),
+			LinkLayerAddr: net.HardwareAddr{0xde, 0xad, 0, 0, 0xbe, 0xef},
 		},
-	}
+	)
 	require.Equal(t, OptionServerID, opt.Code())
 	require.Contains(
 		t,
 		opt.String(),
-		"sid=DUID{type=DUID-LL hwtype=Ethernet hwaddr=de:ad:00:00:be:ef}",
+		"ServerID: DUID{type=DUID-LL hwtype=Ethernet hwaddr=de:ad:00:00:be:ef}",
 		"String() should contain the correct sid output",
 	)
 }
 
-func TestOptServerIdParseOptServerIdBogusDUID(t *testing.T) {
+func TestOptServerIdparseOptServerIDBogusDUID(t *testing.T) {
 	data := []byte{
 		0, 4, // DUID_UUID
 		1, 2, 3, 4, 5, 6, 7, 8, 9, // a UUID should be 18 bytes not 17
 		10, 11, 12, 13, 14, 15, 16, 17,
 	}
-	_, err := ParseOptServerId(data)
+	_, err := parseOptServerID(data)
 	require.Error(t, err, "A truncated OptServerId DUID should return an error")
 }
 
-func TestOptServerIdParseOptServerIdInvalidTooShort(t *testing.T) {
+func TestOptServerIdparseOptServerIDInvalidTooShort(t *testing.T) {
 	data := []byte{
 		0, // truncated: DUIDs are at least 2 bytes
 	}
-	_, err := ParseOptServerId(data)
+	_, err := parseOptServerID(data)
 	require.Error(t, err, "A truncated OptServerId should return an error")
 }