@@ -67,15 +67,15 @@ def get_module_args_state_none():
67
67
}
68
68
69
69
70
- def get_module_args_zone (type , zone , state = 'present' , force = False , bridge = None ):
70
+ def get_module_args_zone (zone_type , zone , state = 'present' , update = True , bridge = None ):
71
71
return {
72
72
'api_host' : 'host' ,
73
73
'api_user' : 'user' ,
74
74
'api_password' : 'password' ,
75
- 'type' : type ,
75
+ 'type' : zone_type ,
76
76
'zone' : zone ,
77
77
'state' : state ,
78
- 'force ' : force ,
78
+ 'update ' : update ,
79
79
'bridge' : bridge
80
80
}
81
81
@@ -98,60 +98,50 @@ def setUp(self):
98
98
99
99
def tearDown (self ):
100
100
self .connect_mock .stop ()
101
- # self.mock_module_helper.stop()
102
101
self .exit_json_patcher .stop ()
103
102
self .fail_json_patcher .stop ()
104
103
super (TestProxmoxZoneModule , self ).tearDown ()
105
104
106
- def test_get_zones (self ):
107
- with pytest .raises (SystemExit ) as exc_info :
108
- with set_module_args (get_module_args_state_none ()):
109
- self .module .main ()
110
- result = exc_info .value .args [0 ]
111
- assert result ["changed" ] is False
112
- assert result ["msg" ] == "Successfully retrieved zone info."
113
- assert result ["zones" ] == RAW_ZONES
114
-
115
105
def test_zone_present (self ):
116
106
# Create new Zone
117
107
with pytest .raises (SystemExit ) as exc_info :
118
- with set_module_args (get_module_args_zone (type = 'simple' , zone = 'test' )):
108
+ with set_module_args (get_module_args_zone (zone_type = 'simple' , zone = 'test' )):
119
109
self .module .main ()
120
110
result = exc_info .value .args [0 ]
121
111
assert result ["changed" ] is True
122
112
assert result ["msg" ] == "Created new Zone - test"
123
113
assert result ['zone' ] == 'test'
124
114
125
- # Zone Already exists without force
115
+ # Update the zone
126
116
with pytest .raises (SystemExit ) as exc_info :
127
- with set_module_args (get_module_args_zone (type = 'simple' , zone = 'test1' )):
117
+ with set_module_args (get_module_args_zone (zone_type = 'simple' , zone = 'test1' , state = 'present ' )):
128
118
self .module .main ()
129
119
result = exc_info .value .args [0 ]
130
- assert result ["changed" ] is False
131
- assert result ["msg" ] == 'Zone test1 already exists and force is false!'
120
+ assert result ["changed" ] is True
121
+ assert result ["msg" ] == "Updated zone - test1"
132
122
assert result ['zone' ] == 'test1'
133
123
134
- # Zone Already exists with force and different type
124
+ # Zone Already exists update=False
135
125
with pytest .raises (SystemExit ) as exc_info :
136
- with set_module_args (get_module_args_zone (type = 'vlan ' , zone = 'test1' , force = True , bridge = 'test' )):
126
+ with set_module_args (get_module_args_zone (zone_type = 'simple ' , zone = 'test1' , update = False )):
137
127
self .module .main ()
138
128
result = exc_info .value .args [0 ]
139
- assert self . fail_json_mock . called
140
- assert result ['failed' ] is True
141
- assert result ['msg ' ] == 'zone test1 exists with different type and we cannot change type post fact. '
129
+ assert result [ "changed" ] is False
130
+ assert result ["msg" ] == 'Zone test1 already exists and update is false!'
131
+ assert result ['zone ' ] == 'test1'
142
132
143
- def test_zone_update ( self ):
133
+ # Zone Already exists with update=True
144
134
with pytest .raises (SystemExit ) as exc_info :
145
- with set_module_args (get_module_args_zone (type = 'simple ' , zone = 'test1' , state = 'update ' )):
135
+ with set_module_args (get_module_args_zone (zone_type = 'vlan ' , zone = 'test1' , update = True , bridge = 'test ' )):
146
136
self .module .main ()
147
137
result = exc_info .value .args [0 ]
148
- assert result [ "changed" ] is True
149
- assert result ["msg" ] == "Updated zone test1"
150
- assert result ['zone ' ] == 'test1'
138
+ assert self . fail_json_mock . called
139
+ assert result ['failed' ] is True
140
+ assert result ['msg ' ] == 'zone test1 exists with different type and we cannot change type post fact. '
151
141
152
142
def test_zone_absent (self ):
153
143
with pytest .raises (SystemExit ) as exc_info :
154
- with set_module_args (get_module_args_zone (type = 'simple' , zone = 'test1' , state = 'absent' )):
144
+ with set_module_args (get_module_args_zone (zone_type = 'simple' , zone = 'test1' , state = 'absent' )):
155
145
self .module .main ()
156
146
result = exc_info .value .args [0 ]
157
147
assert result ["changed" ] is True
0 commit comments