Seperate Definitions by Sub System

internal/definitions/common/hardwareaddress.go

@@ -0,0 +1,30 @@
+package common
+
+import (
+	"encoding/json"
+	"net"
+)
+
+type HardwareAddress struct {
+	net.HardwareAddr
+}
+
+// MarshalJSON for IPCIDR
+func (i HardwareAddress) MarshalJSON() ([]byte, error) {
+	return json.Marshal(i.String())
+}
+
+// UnmarshalJSON for IPCIDR
+func (i *HardwareAddress) UnmarshalJSON(b []byte) error {
+	var s string
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+
+	mac, err := net.ParseMAC(s)
+	if err != nil {
+		return err
+	}
+	i.HardwareAddr = mac
+	return nil
+}

internal/definitions/common/ipcidr.go

@@ -0,0 +1,32 @@
+package common
+
+import (
+	"encoding/json"
+	"net"
+)
+
+// IPCIDR is IP Address with the mask in CIDR format
+type IPCIDR struct {
+	net.IPNet
+}
+
+// MarshalJSON for IPCIDR
+func (i IPCIDR) MarshalJSON() ([]byte, error) {
+	return json.Marshal(i.String())
+}
+
+// UnmarshalJSON for IPCIDR
+func (i *IPCIDR) UnmarshalJSON(b []byte) error {
+	var s string
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+
+	ip, ipnet, err := net.ParseCIDR(s)
+	if err != nil {
+		return err
+	}
+	i.IPNet = *ipnet
+	i.IPNet.IP = ip
+	return nil
+}

internal/definitions/common/ipnet.go

@@ -0,0 +1,30 @@
+package common
+
+import (
+	"encoding/json"
+	"net"
+)
+
+type IPNet struct {
+	net.IPNet
+}
+
+// MarshalJSON for IPNet
+func (i IPNet) MarshalJSON() ([]byte, error) {
+	return json.Marshal(i.String())
+}
+
+// UnmarshalJSON for IPNet
+func (i *IPNet) UnmarshalJSON(b []byte) error {
+	var s string
+	if err := json.Unmarshal(b, &s); err != nil {
+		return err
+	}
+
+	_, ipnet, err := net.ParseCIDR(s)
+	if err != nil {
+		return err
+	}
+	i.IPNet = *ipnet
+	return nil
+}