@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
13
13
limitations under the License.
14
14
*/
15
15
16
- package resources
16
+ package planner
17
17
18
18
import (
19
19
"testing"
@@ -26,12 +26,12 @@ import (
26
26
27
27
func TestPlannerDNSRegister (t * testing.T ) {
28
28
var (
29
- d dnsRegister
30
- planner * sharePlanner
29
+ d DNSRegister
30
+ planner * Planner
31
31
)
32
32
33
33
// no dns register specified
34
- planner = newSharePlanner (
34
+ planner = New (
35
35
InstanceConfiguration {
36
36
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
37
37
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -40,11 +40,11 @@ func TestPlannerDNSRegister(t *testing.T) {
40
40
},
41
41
},
42
42
& smbcc.SambaContainerConfig {})
43
- d = planner .dnsRegister ()
44
- assert .Equal (t , dnsRegisterNever , d )
43
+ d = planner .DNSRegister ()
44
+ assert .Equal (t , DNSRegisterNever , d )
45
45
46
46
// external-ip
47
- planner = newSharePlanner (
47
+ planner = New (
48
48
InstanceConfiguration {
49
49
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
50
50
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -56,11 +56,11 @@ func TestPlannerDNSRegister(t *testing.T) {
56
56
},
57
57
},
58
58
& smbcc.SambaContainerConfig {})
59
- d = planner .dnsRegister ()
60
- assert .Equal (t , dnsRegisterExternalIP , d )
59
+ d = planner .DNSRegister ()
60
+ assert .Equal (t , DNSRegisterExternalIP , d )
61
61
62
62
// cluster-ip
63
- planner = newSharePlanner (
63
+ planner = New (
64
64
InstanceConfiguration {
65
65
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
66
66
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -72,11 +72,11 @@ func TestPlannerDNSRegister(t *testing.T) {
72
72
},
73
73
},
74
74
& smbcc.SambaContainerConfig {})
75
- d = planner .dnsRegister ()
76
- assert .Equal (t , dnsRegisterClusterIP , d )
75
+ d = planner .DNSRegister ()
76
+ assert .Equal (t , DNSRegisterClusterIP , d )
77
77
78
78
// invalid string for register
79
- planner = newSharePlanner (
79
+ planner = New (
80
80
InstanceConfiguration {
81
81
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
82
82
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -88,11 +88,11 @@ func TestPlannerDNSRegister(t *testing.T) {
88
88
},
89
89
},
90
90
& smbcc.SambaContainerConfig {})
91
- d = planner .dnsRegister ()
92
- assert .Equal (t , dnsRegisterNever , d )
91
+ d = planner .DNSRegister ()
92
+ assert .Equal (t , DNSRegisterNever , d )
93
93
94
94
// not AD. ignore specified value
95
- planner = newSharePlanner (
95
+ planner = New (
96
96
InstanceConfiguration {
97
97
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
98
98
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -104,18 +104,18 @@ func TestPlannerDNSRegister(t *testing.T) {
104
104
},
105
105
},
106
106
& smbcc.SambaContainerConfig {})
107
- d = planner .dnsRegister ()
108
- assert .Equal (t , dnsRegisterNever , d )
107
+ d = planner .DNSRegister ()
108
+ assert .Equal (t , DNSRegisterNever , d )
109
109
}
110
110
111
111
func TestPlannerDNSRegisterArgs (t * testing.T ) {
112
112
var (
113
113
v []string
114
- planner * sharePlanner
114
+ planner * Planner
115
115
)
116
116
117
117
// external-ip
118
- planner = newSharePlanner (
118
+ planner = New (
119
119
InstanceConfiguration {
120
120
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
121
121
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -127,13 +127,13 @@ func TestPlannerDNSRegisterArgs(t *testing.T) {
127
127
},
128
128
},
129
129
& smbcc.SambaContainerConfig {})
130
- v = planner .dnsRegisterArgs ()
130
+ v = planner .Args (). DNSRegister ()
131
131
assert .Equal (t ,
132
132
[]string {"dns-register" , "--watch" , "/var/lib/svcwatch/status.json" },
133
133
v )
134
134
135
135
// cluster-ip
136
- planner = newSharePlanner (
136
+ planner = New (
137
137
InstanceConfiguration {
138
138
SecurityConfig : & sambaoperatorv1alpha1.SmbSecurityConfig {
139
139
Spec : sambaoperatorv1alpha1.SmbSecurityConfigSpec {
@@ -145,7 +145,7 @@ func TestPlannerDNSRegisterArgs(t *testing.T) {
145
145
},
146
146
},
147
147
& smbcc.SambaContainerConfig {})
148
- v = planner .dnsRegisterArgs ()
148
+ v = planner .Args (). DNSRegister ()
149
149
assert .Equal (t ,
150
150
[]string {
151
151
"dns-register" ,
0 commit comments