1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148 | diff --git a/subnet.go b/subnet.go
index b2adfc4..610961a 100644
--- a/subnet.go
+++ b/subnet.go
@@ -18,7 +18,7 @@ type subnet struct {
id int
name string
space string
- vlan *vlan
+ vlan vlan
gateway string
cidr string
@@ -27,37 +27,37 @@ type subnet struct {
}
// ID implements Subnet.
-func (s *subnet) ID() int {
+func (s subnet) ID() int {
return s.id
}
// Name implements Subnet.
-func (s *subnet) Name() string {
+func (s subnet) Name() string {
return s.name
}
// Space implements Subnet.
-func (s *subnet) Space() string {
+func (s subnet) Space() string {
return s.space
}
// VLAN implements Subnet.
-func (s *subnet) VLAN() VLAN {
+func (s subnet) VLAN() VLAN {
return s.vlan
}
// Gateway implements Subnet.
-func (s *subnet) Gateway() string {
+func (s subnet) Gateway() string {
return s.gateway
}
// CIDR implements Subnet.
-func (s *subnet) CIDR() string {
+func (s subnet) CIDR() string {
return s.cidr
}
// DNSServers implements Subnet.
-func (s *subnet) DNSServers() []string {
+func (s subnet) DNSServers() []string {
return s.dnsServers
}
@@ -135,15 +135,15 @@ func subnet_2_0(source map[string]interface{}) (*subnet, error) {
// empty string.
gateway, _ := valid["gateway_ip"].(string)
- result := &subnet{
+ result := subnet{
resourceURI: valid["resource_uri"].(string),
id: valid["id"].(int),
name: valid["name"].(string),
space: valid["space"].(string),
- vlan: vlan,
+ vlan: *vlan,
gateway: gateway,
cidr: valid["cidr"].(string),
dnsServers: convertToStringSlice(valid["dns_servers"]),
}
- return result, nil
+ return &result, nil
}
diff --git a/vlan.go b/vlan.go
index c509d42..f6cc503 100644
--- a/vlan.go
+++ b/vlan.go
@@ -28,42 +28,42 @@ type vlan struct {
}
// ID implements VLAN.
-func (v *vlan) ID() int {
+func (v vlan) ID() int {
return v.id
}
// Name implements VLAN.
-func (v *vlan) Name() string {
+func (v vlan) Name() string {
return v.name
}
// Fabric implements VLAN.
-func (v *vlan) Fabric() string {
+func (v vlan) Fabric() string {
return v.fabric
}
// VID implements VLAN.
-func (v *vlan) VID() int {
+func (v vlan) VID() int {
return v.vid
}
// MTU implements VLAN.
-func (v *vlan) MTU() int {
+func (v vlan) MTU() int {
return v.mtu
}
// DHCP implements VLAN.
-func (v *vlan) DHCP() bool {
+func (v vlan) DHCP() bool {
return v.dhcp
}
// PrimaryRack implements VLAN.
-func (v *vlan) PrimaryRack() string {
+func (v vlan) PrimaryRack() string {
return v.primaryRack
}
// SecondaryRack implements VLAN.
-func (v *vlan) SecondaryRack() string {
+func (v vlan) SecondaryRack() string {
return v.secondaryRack
}
@@ -139,7 +139,7 @@ func vlan_2_0(source map[string]interface{}) (*vlan, error) {
secondary_rack, _ := valid["secondary_rack"].(string)
name, _ := valid["name"].(string)
- result := &vlan{
+ result := vlan{
resourceURI: valid["resource_uri"].(string),
id: valid["id"].(int),
name: name,
@@ -150,5 +150,5 @@ func vlan_2_0(source map[string]interface{}) (*vlan, error) {
primaryRack: primary_rack,
secondaryRack: secondary_rack,
}
- return result, nil
+ return &result, nil
}
|