foreman_fog_proxmox 0.5.0 → 0.5.1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of foreman_fog_proxmox might be problematic. Click here for more details.

Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +16 -5
  3. data/app/models/foreman_fog_proxmox/proxmox.rb +1 -1
  4. data/lib/foreman_fog_proxmox/version.rb +1 -1
  5. data/locale/en/foreman_fog_proxmox.edit.po +22 -38
  6. data/locale/foreman_fog_proxmox.pot +21 -20
  7. data/locale/fr/foreman_fog_proxmox.edit.po +22 -38
  8. data/test/factories/proxmox_factory.rb +7 -6
  9. data/test/unit/foreman_fog_proxmox/proxmox_test.rb +3 -2
  10. metadata +19 -33
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 475afb51f19055c5bf62055527903df576d3eafe
4
- data.tar.gz: ed7c4afa8aee30e7e80f7fcc7258d13ae3dbca72
3
+ metadata.gz: a113c8eac6532d413340a2c98dd00bb895737e19
4
+ data.tar.gz: 6a7bd6ef921fce9a8c8e4479fb4a72a5170c38c9
5
5
  SHA512:
6
- metadata.gz: 604c52d8435cbda0f9fe498d07c2fe3a58576152303148f9005fff7c59c3b2dbe1bb24e50bd6c8a77f79e8a8584b54cd895e60fbe40a5936a4cb696c79e74995
7
- data.tar.gz: a4afeaac998b8e596efb70a48dfc2a5ea44701dcd8688566e791644d54c0a9f5cfe4c31bc9a452a1684d58d2bf4b2879868c19933c459a7721a4f3684e7b2346
6
+ metadata.gz: 8a8e948bbb480efd6c8d3c6c570e709bc9b9d9c9c88aac85b4862bf7a4080f34e0474f6ad7e8a56ee25e045ff93fed267bff61699758d8fbdbff4ac30ed96a57
7
+ data.tar.gz: 87419d8fa22e223082f86d4879dbd29af78db610584f95e2c01de58879e9136c3c5924b1a652f68206f0836f16ac76790a9bf8b896bc95fc77daba477b44c7e6
data/README.md CHANGED
@@ -10,12 +10,16 @@
10
10
 
11
11
  It is intended to satisfy this [feature](http://projects.theforeman.org/issues/2186).
12
12
 
13
+ If you like it and need more features you can [support](SUPPORT.md) it.
14
+
13
15
  ## Compatibility
14
16
 
15
17
  Tested with:
16
18
 
17
- * Foreman = 1.17.3
19
+ * Foreman >= 1.17 and < 1.20
18
20
  * Fog-proxmox >= 0.5.1
21
+ * Proxmox >= 5.1
22
+ * Ruby >= 2.3
19
23
 
20
24
  ## Installation
21
25
 
@@ -29,7 +33,7 @@ See complete details in [plugin installation from gem](https://theforeman.org/pl
29
33
 
30
34
  Here is a Debian sample:
31
35
 
32
- * Install foreman 1.17 [from OS packages](https://theforeman.org/manuals/1.17/index.html#3.3InstallFromPackages):
36
+ * Install foreman [from OS packages](https://theforeman.org/manuals/1.19/index.html#3.3InstallFromPackages):
33
37
 
34
38
  ```shell
35
39
  sudo apt install -y foreman foreman-compute foreman-sqlite3 foreman-assets
@@ -60,7 +64,7 @@ sudo -u foreman /usr/bin/foreman-ruby /usr/bin/bundle install
60
64
  /usr/bin/foreman-ruby /usr/bin/bundle exec bin/rake plugin:gettext[foreman_fog_proxmox]
61
65
  ```
62
66
 
63
- * Complete installation of foreman 1.17 with foreman-installer:
67
+ * Complete installation of foreman 1.17+ with foreman-installer:
64
68
 
65
69
  ```shell
66
70
  sudo apt install -y foreman-installer
@@ -105,7 +109,7 @@ You also need nodejs in your dev machine to run webpack-dev-server.
105
109
 
106
110
  * Fork this github repo.
107
111
  * Clone it on your local machine
108
- * Install foreman v1.17.3 on your machine:
112
+ * Install foreman v1.17.3 or later on your machine:
109
113
 
110
114
  ```shell
111
115
  git clone https://github.com/theforeman/foreman
@@ -145,6 +149,13 @@ bundle exec bin/rake db:seed
145
149
  bundle exec bin/rake permissions:reset
146
150
  ```
147
151
 
152
+ * You sholud write tests and you can execute those specific to this plugin:
153
+
154
+ ```shell
155
+ export DISABLE_SPRING=true
156
+ bundle exec bin/rake test:foreman_fog_proxmox
157
+ ```
158
+
148
159
  * In foreman directory, after you modify foreman_fog_proxmox specific assets (proxmox.js, etc) you have to precompile it:
149
160
 
150
161
  ```shell
@@ -184,4 +195,4 @@ The code is available as open source under the terms of the [GNU Public License
184
195
 
185
196
  ## Code of Conduct
186
197
 
187
- Everyone interacting in the ForemanProxmox project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](CODE_OF_CONDUCT.md).
198
+ Everyone interacting in the ForemanProxmox project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](CODE_OF_CONDUCT.md).
data/app/models/foreman_fog_proxmox/proxmox.rb CHANGED
@@ -85,7 +85,7 @@ module ForemanFogProxmox
85
85
  end
86
86
 
87
87
  def bridges
88
- node = network_client.nodes.all.first
88
+ node = network_client.nodes.find_by_id node_name
89
89
  bridges = node.networks.all(type: 'bridge')
90
90
  bridges.sort_by(&:iface)
91
91
  end
data/lib/foreman_fog_proxmox/version.rb CHANGED
@@ -18,5 +18,5 @@
18
18
  # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
19
19
 
20
20
  module ForemanFogProxmox
21
- VERSION = '0.5.0'.freeze
21
+ VERSION = '0.5.1'.freeze
22
22
  end
data/locale/en/foreman_fog_proxmox.edit.po CHANGED
@@ -33,63 +33,63 @@ msgstr ""
33
33
  msgid "Change the password"
34
34
  msgstr ""
35
35
 
36
- #: ../app/helpers/proxmox_vm_helper.rb:78
36
+ #: ../app/helpers/proxmox_vm_helper.rb:79
37
37
  msgid "Invalid uuid=[%{uuid}]."
38
38
  msgstr ""
39
39
 
40
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:114
40
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:116
41
41
  msgid "Operating system family %{type} is not consistent with %{ostype}"
42
42
  msgstr ""
43
43
 
44
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:121
44
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:123
45
45
  msgid "Identifier interface[%{index}] required."
46
46
  msgstr ""
47
47
 
48
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:122
48
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:124
49
49
  msgid "Invalid identifier interface[%{index}]. Must be net[n] with n integer >= 0"
50
50
  msgstr ""
51
51
 
52
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:198
52
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:201
53
53
  msgid "new_vm() vm.config=%{config}"
54
54
  msgstr ""
55
55
 
56
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:204
56
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:207
57
57
  msgid "new_container_vm() vm.config=%{config}"
58
58
  msgstr ""
59
59
 
60
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:210
60
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:213
61
61
  msgid "new_server_vm() vm.config=%{config}"
62
62
  msgstr ""
63
63
 
64
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:217
64
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:220
65
65
  msgid "invalid vmid=%{vmid}"
66
66
  msgstr ""
67
67
 
68
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:221
68
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:223
69
69
  msgid "create_vm(): clone %{image_id} in %{vmid}"
70
70
  msgstr ""
71
71
 
72
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:225
72
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:229
73
73
  msgid "create_vm(): %{args}"
74
74
  msgstr ""
75
75
 
76
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:239
76
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:243
77
77
  msgid "failed to create vm: %{e}"
78
78
  msgstr ""
79
79
 
80
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:253
80
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:257
81
81
  msgid "Failed retrieving proxmox vm by vmid=%{vmid} and type=%{type}"
82
82
  msgstr ""
83
83
 
84
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:291
84
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:297
85
85
  msgid "save_vm(): %{attr}"
86
86
  msgstr ""
87
87
 
88
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:329
88
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:343
89
89
  msgid "Unable to store X509 certificates"
90
90
  msgstr ""
91
91
 
92
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:353
92
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:371
93
93
  msgid "%s console is not supported at this time"
94
94
  msgstr ""
95
95
 
@@ -117,6 +117,10 @@ msgstr ""
117
117
  msgid "Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer."
118
118
  msgstr ""
119
119
 
120
+ #: ../app/views/compute_resources/form/_proxmox.html.erb:12 ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
121
+ msgid "Node"
122
+ msgstr ""
123
+
120
124
  #: ../app/views/compute_resources/show/_proxmox.html.erb:4
121
125
  msgid "URL"
122
126
  msgstr ""
@@ -153,10 +157,6 @@ msgstr ""
153
157
  msgid "VM ID"
154
158
  msgstr ""
155
159
 
156
- #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
157
- msgid "Node"
158
- msgstr ""
159
-
160
160
  #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:18 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
161
161
  msgid "Image"
162
162
  msgstr ""
@@ -259,31 +259,15 @@ msgstr ""
259
259
  msgid "Name"
260
260
  msgstr ""
261
261
 
262
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7
263
- msgid "IPv4"
264
- msgstr ""
265
-
266
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7
267
- msgid "e.g. dhcp or IPv4/CIDR format or manual"
268
- msgstr ""
269
-
270
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8
271
- msgid "IPv6"
272
- msgstr ""
273
-
274
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8
275
- msgid "e.g. dhcp or IPv6/CIDR format or manual"
276
- msgstr ""
277
-
278
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:9
262
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:9
279
263
  msgid "VLAN tag"
280
264
  msgstr ""
281
265
 
282
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:10
266
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:10
283
267
  msgid "Rate limit"
284
268
  msgstr ""
285
269
 
286
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:11 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:8
270
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:8
287
271
  msgid "Bridge"
288
272
  msgstr ""
289
273
 
data/locale/foreman_fog_proxmox.pot CHANGED
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: foreman_fog_proxmox 1.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2018-08-26 15:17+0200\n"
12
- "PO-Revision-Date: 2018-08-26 15:17+0200\n"
11
+ "POT-Creation-Date: 2018-09-10 09:45+0200\n"
12
+ "PO-Revision-Date: 2018-09-10 09:45+0200\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -38,59 +38,59 @@ msgstr ""
38
38
  msgid "Invalid uuid=[%{uuid}]."
39
39
  msgstr ""
40
40
 
41
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:114
41
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:116
42
42
  msgid "Operating system family %{type} is not consistent with %{ostype}"
43
43
  msgstr ""
44
44
 
45
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:121
45
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:123
46
46
  msgid "Identifier interface[%{index}] required."
47
47
  msgstr ""
48
48
 
49
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:122
49
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:124
50
50
  msgid "Invalid identifier interface[%{index}]. Must be net[n] with n integer >= 0"
51
51
  msgstr ""
52
52
 
53
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:199
53
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:201
54
54
  msgid "new_vm() vm.config=%{config}"
55
55
  msgstr ""
56
56
 
57
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:205
57
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:207
58
58
  msgid "new_container_vm() vm.config=%{config}"
59
59
  msgstr ""
60
60
 
61
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:211
61
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:213
62
62
  msgid "new_server_vm() vm.config=%{config}"
63
63
  msgstr ""
64
64
 
65
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:218
65
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:220
66
66
  msgid "invalid vmid=%{vmid}"
67
67
  msgstr ""
68
68
 
69
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:222
69
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:223
70
70
  msgid "create_vm(): clone %{image_id} in %{vmid}"
71
71
  msgstr ""
72
72
 
73
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:226
73
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:229
74
74
  msgid "create_vm(): %{args}"
75
75
  msgstr ""
76
76
 
77
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:240
77
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:243
78
78
  msgid "failed to create vm: %{e}"
79
79
  msgstr ""
80
80
 
81
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:254
81
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:257
82
82
  msgid "Failed retrieving proxmox vm by vmid=%{vmid} and type=%{type}"
83
83
  msgstr ""
84
84
 
85
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:292
85
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:297
86
86
  msgid "save_vm(): %{attr}"
87
87
  msgstr ""
88
88
 
89
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:330
89
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:343
90
90
  msgid "Unable to store X509 certificates"
91
91
  msgstr ""
92
92
 
93
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:354
93
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:371
94
94
  msgid "%s console is not supported at this time"
95
95
  msgstr ""
96
96
 
@@ -120,6 +120,11 @@ msgid ""
120
120
  "le ssl_verify_peer."
121
121
  msgstr ""
122
122
 
123
+ #: ../app/views/compute_resources/form/_proxmox.html.erb:12
124
+ #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
125
+ msgid "Node"
126
+ msgstr ""
127
+
123
128
  #: ../app/views/compute_resources/show/_proxmox.html.erb:4
124
129
  msgid "URL"
125
130
  msgstr ""
@@ -171,10 +176,6 @@ msgstr ""
171
176
  msgid "VM ID"
172
177
  msgstr ""
173
178
 
174
- #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
175
- msgid "Node"
176
- msgstr ""
177
-
178
179
  #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:18
179
180
  #: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
180
181
  msgid "Image"
data/locale/fr/foreman_fog_proxmox.edit.po CHANGED
@@ -33,63 +33,63 @@ msgstr "Touches verrouillées"
33
33
  msgid "Change the password"
34
34
  msgstr "Changer le mot de passe"
35
35
 
36
- #: ../app/helpers/proxmox_vm_helper.rb:78
36
+ #: ../app/helpers/proxmox_vm_helper.rb:79
37
37
  msgid "Invalid uuid=[%{uuid}]."
38
38
  msgstr ""
39
39
 
40
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:114
40
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:116
41
41
  msgid "Operating system family %{type} is not consistent with %{ostype}"
42
42
  msgstr "La famille %{type} du système d'exploitation n'est pas cohérente avec %{ostype}"
43
43
 
44
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:121
44
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:123
45
45
  msgid "Identifier interface[%{index}] required."
46
46
  msgstr "L'identifiant de interface[%{index}] est obligatoire."
47
47
 
48
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:122
48
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:124
49
49
  msgid "Invalid identifier interface[%{index}]. Must be net[n] with n integer >= 0"
50
50
  msgstr "L'identifiant de interface[%{index}] est incorrect. La syntaxe correcte est net[n] avec n un entier naturel positif"
51
51
 
52
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:198
52
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:201
53
53
  msgid "new_vm() vm.config=%{config}"
54
54
  msgstr ""
55
55
 
56
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:204
56
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:207
57
57
  msgid "new_container_vm() vm.config=%{config}"
58
58
  msgstr ""
59
59
 
60
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:210
60
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:213
61
61
  msgid "new_server_vm() vm.config=%{config}"
62
62
  msgstr ""
63
63
 
64
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:217
64
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:220
65
65
  msgid "invalid vmid=%{vmid}"
66
66
  msgstr "vmid=%{vmid} incorrect"
67
67
 
68
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:221
68
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:223
69
69
  msgid "create_vm(): clone %{image_id} in %{vmid}"
70
70
  msgstr ""
71
71
 
72
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:225
72
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:229
73
73
  msgid "create_vm(): %{args}"
74
74
  msgstr ""
75
75
 
76
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:239
76
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:243
77
77
  msgid "failed to create vm: %{e}"
78
78
  msgstr "échec à la création de la VM: %{e}"
79
79
 
80
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:253
80
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:257
81
81
  msgid "Failed retrieving proxmox vm by vmid=%{vmid} and type=%{type}"
82
82
  msgstr "Echec de récupération de la vm proxmox avec vmid=%{vmid} et type=%{type}"
83
83
 
84
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:291
84
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:297
85
85
  msgid "save_vm(): %{attr}"
86
86
  msgstr ""
87
87
 
88
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:329
88
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:343
89
89
  msgid "Unable to store X509 certificates"
90
90
  msgstr "Impossible d'enregistrer les certificats X509"
91
91
 
92
- #: ../app/models/foreman_fog_proxmox/proxmox.rb:353
92
+ #: ../app/models/foreman_fog_proxmox/proxmox.rb:371
93
93
  msgid "%s console is not supported at this time"
94
94
  msgstr "%s console pas encore supportée"
95
95
 
@@ -117,6 +117,10 @@ msgstr "Autorités de certification X509"
117
117
  msgid "Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer."
118
118
  msgstr "Vous pouvez éventuellement fournir un certificat ou une chaîne de certificats. Si non renseigné, alors désactivez ssl_verify_peer."
119
119
 
120
+ #: ../app/views/compute_resources/form/_proxmox.html.erb:12 ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
121
+ msgid "Node"
122
+ msgstr "Noeud"
123
+
120
124
  #: ../app/views/compute_resources/show/_proxmox.html.erb:4
121
125
  msgid "URL"
122
126
  msgstr ""
@@ -153,10 +157,6 @@ msgstr "Créer image?"
153
157
  msgid "VM ID"
154
158
  msgstr ""
155
159
 
156
- #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:8
157
- msgid "Node"
158
- msgstr "Noeud"
159
-
160
160
  #: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:18 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
161
161
  msgid "Image"
162
162
  msgstr ""
@@ -259,31 +259,15 @@ msgstr ""
259
259
  msgid "Name"
260
260
  msgstr "Nom"
261
261
 
262
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7
263
- msgid "IPv4"
264
- msgstr ""
265
-
266
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7
267
- msgid "e.g. dhcp or IPv4/CIDR format or manual"
268
- msgstr "par exemple dhcp ou le format IPv4/CIDR ou manuel"
269
-
270
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8
271
- msgid "IPv6"
272
- msgstr ""
273
-
274
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8
275
- msgid "e.g. dhcp or IPv6/CIDR format or manual"
276
- msgstr "par exemple dhcp ou le format IPv6/CIDR ou manuel"
277
-
278
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:9
262
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:7 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:9
279
263
  msgid "VLAN tag"
280
264
  msgstr "Etiquette VLAN"
281
265
 
282
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:10
266
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:10
283
267
  msgid "Rate limit"
284
268
  msgstr "Taux limite"
285
269
 
286
- #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:11 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:8
270
+ #: ../app/views/compute_resources_vms/form/proxmox/container/_network.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_network.html.erb:8
287
271
  msgid "Bridge"
288
272
  msgstr "Pont"
289
273
 
data/test/factories/proxmox_factory.rb CHANGED
@@ -17,6 +17,8 @@
17
17
  # You should have received a copy of the GNU General Public License
18
18
  # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
19
19
 
20
+ require 'fog/compute/proxmox/models/node'
21
+
20
22
  FactoryBot.define do
21
23
 
22
24
  factory :proxmox_resource, :class => ComputeResource do
@@ -32,15 +34,14 @@ FactoryBot.define do
32
34
 
33
35
  factory :proxmox_cr, :class => ForemanFogProxmox::Proxmox, :traits => [:proxmox]
34
36
 
35
- after(:create) do |cr, evaluator|
36
- FactoryBot.create(:node, :compute_resource => cr)
37
- end
38
-
39
37
  end
40
38
 
41
- factory :node do
39
+ factory :node, :class => Fog::Compute::Proxmox::Node do
42
40
  sequence(:identity) { |n| "node#{n}" }
43
- association :compute_resource, factory: :proxmox_cr
41
+ trait :pve do
42
+ identity 'pve'
43
+ end
44
+ factory :pve_node, :class => Fog::Compute::Proxmox::Node, :traits => [:pve]
44
45
  end
45
46
 
46
47
  def deferred_nic_attrs
data/test/unit/foreman_fog_proxmox/proxmox_test.rb CHANGED
@@ -45,9 +45,10 @@ module ForemanFogProxmox
45
45
  end
46
46
 
47
47
  test "#node" do
48
- node_name = 'pve'
48
+ node = mock('node')
49
49
  cr = FactoryBot.build_stubbed(:proxmox_cr)
50
- assert_equal node_name, (as_admin { cr.node.to_s })
50
+ cr.stubs(:node).returns(node)
51
+ assert_equal node, (as_admin { cr.node })
51
52
  end
52
53
 
53
54
  describe "destroy_vm" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_fog_proxmox
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tristan Robert
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-09-04 00:00:00.000000000 Z
11
+ date: 2018-09-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: fog-proxmox
@@ -28,74 +28,60 @@ dependencies:
28
28
  name: deface
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '1.3'
33
+ version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '1.3'
41
- - !ruby/object:Gem::Dependency
42
- name: sprockets
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - "~>"
46
- - !ruby/object:Gem::Version
47
- version: '3.7'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - "~>"
53
- - !ruby/object:Gem::Version
54
- version: '3.7'
40
+ version: '0'
55
41
  - !ruby/object:Gem::Dependency
56
42
  name: rdoc
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - "~>"
45
+ - - ">="
60
46
  - !ruby/object:Gem::Version
61
- version: '6.0'
47
+ version: '0'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - "~>"
52
+ - - ">="
67
53
  - !ruby/object:Gem::Version
68
- version: '6.0'
54
+ version: '0'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: rubocop
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
- - - "~>"
59
+ - - ">="
74
60
  - !ruby/object:Gem::Version
75
- version: '0.58'
61
+ version: '0'
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
- - - "~>"
66
+ - - ">="
81
67
  - !ruby/object:Gem::Version
82
- version: '0.58'
68
+ version: '0'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: simplecov
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
- - - "~>"
73
+ - - ">="
88
74
  - !ruby/object:Gem::Version
89
- version: '0.16'
75
+ version: '0'
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
- - - "~>"
80
+ - - ">="
95
81
  - !ruby/object:Gem::Version
96
- version: '0.16'
82
+ version: '0'
97
83
  description: Foreman plugin adds Proxmox VE compute resource using fog-proxmox. It
98
- is compatible with Foreman 1.17
84
+ is compatible with Foreman 1.17+
99
85
  email:
100
86
  - tristan.robert.44@gmail.com
101
87
  executables: []