wakame-vdc-webui 11.06.0 → 11.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +7 -7
- data/app/controllers/application_controller.rb +5 -1
- data/app/controllers/dialog_controller.rb +5 -8
- data/app/controllers/instances_controller.rb +25 -7
- data/app/controllers/keypairs_controller.rb +2 -3
- data/app/controllers/security_groups_controller.rb +14 -15
- data/app/controllers/sessions_controller.rb +4 -0
- data/app/controllers/snapshots_controller.rb +3 -3
- data/app/controllers/volumes_controller.rb +18 -12
- data/app/models/dcmgr_resource/instance.rb +18 -2
- data/app/models/dcmgr_resource/security_group.rb +38 -0
- data/app/models/dcmgr_resource/ssh_key_pair.rb +0 -1
- data/app/views/dialog/attach_volume.html.erb +7 -11
- data/app/views/dialog/create_and_edit_security_group.html.erb +10 -12
- data/app/views/dialog/create_ssh_keypair.html.erb +9 -14
- data/app/views/dialog/delete_security_group.html.erb +1 -1
- data/app/views/dialog/reboot_instances.html.erb +2 -2
- data/app/views/dialog/start_instances.html.erb +1 -1
- data/app/views/dialog/stop_instances.html.erb +2 -2
- data/app/views/instances/index.html.erb +114 -110
- data/app/views/keypairs/index.html.erb +4 -4
- data/app/views/layouts/login.html.erb +1 -1
- data/app/views/security_groups/index.html.erb +11 -11
- data/app/views/sessions/information.html.erb +0 -0
- data/app/views/sessions/new.html.erb +24 -31
- data/app/views/snapshots/index.html.erb +3 -0
- data/app/views/volumes/index.html.erb +0 -5
- data/config/application.rb +1 -1
- data/config/dcmgr_gui.yml +8 -0
- data/{app/api/config/environment.rb → config/environment-auth.rb} +1 -1
- data/config/environments/development.rb +1 -1
- data/config/environments/production.rb +38 -41
- data/config/environments/test.rb +1 -1
- data/config/initializers/site.rb +1 -1
- data/config/locales/en.yml +16 -7
- data/config/locales/ja.yml +6 -4
- data/config/routes.rb +3 -0
- data/db/migrations/0001_origin.rb +96 -0
- data/lib/cli/account.rb +43 -88
- data/lib/cli/user.rb +0 -37
- data/lib/tasks/dcmgr_gui.rake +2 -2
- data/public/i18n/Messages_en.properties +34 -0
- data/public/i18n/Messages_ja-JP.properties +0 -0
- data/public/i18n/Messages_ja.properties +32 -0
- data/public/javascripts/dcmgr_gui/application.js +7 -7
- data/public/javascripts/dcmgr_gui/core.js +33 -8
- data/public/javascripts/dcmgr_gui/image_panel.js +6 -8
- data/public/javascripts/dcmgr_gui/instance_panel.js +29 -29
- data/public/javascripts/dcmgr_gui/security_group_panel.js +8 -29
- data/public/javascripts/dcmgr_gui/sshkeypair_panel.js +2 -22
- data/public/javascripts/dcmgr_gui/volume_panel.js +16 -21
- data/public/javascripts/jquery-ui-1.8.4.custom.min.js +0 -0
- data/public/stylesheets/common.css +45 -0
- metadata +336 -332
- data/app/models/dcmgr_resource/netfilter_group.rb +0 -29
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
<div id="create_ssh_keypair_dialog">
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
<input id="ssh_keypair_download_once" type="checkbox" name="download_once" checked>
|
|
12
|
-
</td>
|
|
13
|
-
</tr>
|
|
14
|
-
</table>
|
|
15
|
-
</div>
|
|
2
|
+
<table>
|
|
3
|
+
<tr>
|
|
4
|
+
<td><%= t("dialog.create_ssh_keypair.download_once")%>: </td>
|
|
5
|
+
<td>
|
|
6
|
+
<input id="ssh_keypair_download_once" type="checkbox" name="download_once" checked>
|
|
7
|
+
</td>
|
|
8
|
+
</tr>
|
|
9
|
+
</table>
|
|
10
|
+
</div>
|
|
@@ -13,119 +13,123 @@ jQuery(function($){
|
|
|
13
13
|
<% end %>
|
|
14
14
|
|
|
15
15
|
<div id="mainarea_wide">
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
<h3><img src="images/icon_resource.gif" /><%= t("instances.header") %><a href="javascript:void(0);" class="showhide"></a></h3>
|
|
17
|
+
<div id="list_load_mask" class="maincontent">
|
|
18
|
+
<div class="controller clearfix">
|
|
19
19
|
<select name="instance_action" id="instance_action" style="height:10px">
|
|
20
20
|
<option value="" selected="selected"><%= t("selectmenu.select_action") %></option>
|
|
21
21
|
<optgroup label="Action">
|
|
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
|
-
|
|
22
|
+
<option class="terminate" value="terminate"><%= t("instances.instance_actions.terminate") %></option>
|
|
23
|
+
<option class="reboot" value="reboot"><%= t("instances.instance_actions.reboot") %></option>
|
|
24
|
+
<option class="start" value="start"><%= t("instances.instance_actions.start") %></option>
|
|
25
|
+
<option class="stop" value="stop"><%= t("instances.instance_actions.stop") %></option>
|
|
26
|
+
</optgroup>
|
|
27
|
+
</select>
|
|
28
|
+
<a href="javascript:void(0);" class="refresh" style="margin-left:585px"><%= t("button.refresh") %></a>
|
|
29
|
+
</div>
|
|
30
|
+
<div class="controller clearfix">
|
|
31
|
+
<div id="pagenate" class="r_float">
|
|
32
|
+
<a href="javascript:void(0);" class="prev"></a>
|
|
33
|
+
<p id="viewPagenate"></p>
|
|
34
|
+
<a href="javascript:void(0);" class="next"></a>
|
|
35
|
+
</div>
|
|
36
|
+
</div>
|
|
37
|
+
<div id="display_instances" class="display_area">
|
|
38
|
+
<% content_for :javascript_template do %>
|
|
39
|
+
<script id="instancesListTemplate" type="text/x-jquery-tmpl">
|
|
40
|
+
<table class="ptn01" frame="void" cellpadding="0" cellspacing="0" border="0">
|
|
41
|
+
<tr>
|
|
42
|
+
<th></th>
|
|
43
|
+
<th><%= t("instances.list.instance_id") %></th>
|
|
44
|
+
<th><%= t("instances.list.wmi_id") %></th>
|
|
45
|
+
<th><%= t("instances.list.cpu_cores") %></th>
|
|
46
|
+
<th><%= t("instances.list.memory_size") %></th>
|
|
47
|
+
<th><%= t("instances.list.ip") %></th>
|
|
48
|
+
<th><%= t("instances.list.state") %></th>
|
|
49
|
+
</tr>
|
|
50
|
+
{{each(index,item) rows}}
|
|
51
|
+
<tr id="row-${item.id}">
|
|
52
|
+
{{if item.id }}
|
|
53
|
+
<td class="center listcheckbox"><input type="checkbox" value="${item.id}" > </td>
|
|
54
|
+
{{else}}
|
|
55
|
+
<td class="listcheckbox"></td>
|
|
56
|
+
{{/if}}
|
|
57
|
+
<td class="instance_id" title="${item.id}">${item.id}</td>
|
|
58
|
+
<td class="wmi_id" title="">${item.image_id}</td>
|
|
59
|
+
<td class="vtip center" title="${item.cpu_cores}">${item.cpu_cores}</td>
|
|
60
|
+
<td class="vtip center" title="${item.memory_size}">${item.memory_size}</td>
|
|
61
|
+
<td class="vtip center" title="ip" style="width:60px">
|
|
62
|
+
{{each(index,network) item.vif}}
|
|
63
|
+
{{if network.vif.ipv4 !=null}}
|
|
64
|
+
{{if network.vif.ipv4.ipv4.nat_address === null}}
|
|
62
65
|
${network.vif.ipv4.ipv4.address}
|
|
63
|
-
|
|
66
|
+
{{else}}
|
|
64
67
|
${network.vif.ipv4.ipv4.nat_address}
|
|
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
|
-
|
|
68
|
+
{{/if}}
|
|
69
|
+
{{/if}}
|
|
70
|
+
{{/each}}</td>
|
|
71
|
+
<td class="state vtip center" title="status">${item.state}</td>
|
|
72
|
+
</tr>
|
|
73
|
+
{{/each}}
|
|
74
|
+
</table>
|
|
75
|
+
</script>
|
|
76
|
+
<% end %>
|
|
77
|
+
</div>
|
|
78
|
+
</div>
|
|
79
|
+
<div id="btm_maincontent_wide"></div>
|
|
80
|
+
<h3><img src="images/icon_ttl_detail.gif" /><%= t("instances.details.header") %><a href="javascript:void(0);" class="showhide"></a></h3>
|
|
81
|
+
<div id="detail" class="maincontent">
|
|
82
|
+
<% content_for :javascript_template do %>
|
|
83
|
+
<script id="instancesDetailTemplate" type="text/x-jquery-tmpl">
|
|
84
|
+
<div id="${item.id}" class="display_area">
|
|
85
|
+
<h4 class="ptn01"><%= t("instances.details.instance") %>:<span class="instansid">${item.id}</span></h4>
|
|
86
|
+
<table class="ptn02" frame="void" cellpadding="0" cellspacing="0" border="0">
|
|
87
|
+
<tr>
|
|
88
|
+
<td class="padcell"></td>
|
|
89
|
+
<td class="title"><%= t("instances.details.instance_id") %>:</td>
|
|
90
|
+
<td>${item.id}</td>
|
|
91
|
+
<td class="padcell"></td>
|
|
92
|
+
<td class="title"><%= t("instances.details.wmi_id") %>:</td>
|
|
93
|
+
<td>${item.image_id}</td>
|
|
94
|
+
</tr>
|
|
95
|
+
<tr>
|
|
96
|
+
<td class="padcell"></td>
|
|
97
|
+
<td class="title"><%= t("instances.details.cpu_cores") %>:</td>
|
|
98
|
+
<td>${item.cpu_cores}</td>
|
|
99
|
+
<td class="padcell"></td>
|
|
100
|
+
<td class="title"><%= t("instances.details.memory_size") %>:</td>
|
|
101
|
+
<td>${item.memory_size}</td>
|
|
102
|
+
</tr>
|
|
103
|
+
<tr>
|
|
104
|
+
<td class="padcell"></td>
|
|
105
|
+
<td class="title"><%= t("instances.details.status") %>:</td>
|
|
106
|
+
<td class="state">${item.state}</td>
|
|
107
|
+
<td class="padcell"></td>
|
|
108
|
+
<td class="title">Global IP:</td>
|
|
109
|
+
<td>{{each(index,network) item.vif}}{{if network.ipv4 != null }}${network.ipv4.nat_address}{{/if}}{{/each}}</td>
|
|
110
|
+
</tr>
|
|
111
|
+
<tr>
|
|
112
|
+
<td class="padcell"></td>
|
|
113
|
+
<td class="title"><%= t("instances.details.ssh_key_pair") %>:</td>
|
|
114
|
+
<td>${item.ssh_key_pair}</td>
|
|
115
|
+
<td class="padcell"></td>
|
|
116
|
+
<td class="title">Local IP:</td>
|
|
117
|
+
<td>{{each(index,network) item.vif}}{{if network.ipv4 != null}}${network.ipv4.address}{{/if}}{{/each}}</td>
|
|
118
|
+
</tr>
|
|
119
|
+
<tr>
|
|
120
|
+
<td class="padcell"></td>
|
|
121
|
+
<td class="title"><%= t("instances.details.created_at") %>:</td>
|
|
122
|
+
<td colspan="7">${item.created_at}</td>
|
|
123
|
+
</tr>
|
|
124
|
+
<tr>
|
|
125
|
+
<td class="padcell"></td>
|
|
126
|
+
<td class="title"><%= t("instances.details.security_groups") %>:</td>
|
|
127
|
+
<td>{{each(index,nf) item.security_groups}}${nf}<br />{{/each}}</td>
|
|
128
|
+
</tr>
|
|
129
|
+
</table>
|
|
130
|
+
</div>
|
|
131
|
+
</script>
|
|
132
|
+
<% end %>
|
|
133
|
+
</div><!-- maincontent -->
|
|
134
|
+
<div id="btm_maincontent_wide_last"></div>
|
|
131
135
|
</div><!-- mainarea_wide -->
|
|
@@ -51,7 +51,7 @@ jQuery(function($){
|
|
|
51
51
|
{{else}}
|
|
52
52
|
<td class="listradiobutton"></td>
|
|
53
53
|
{{/if}}
|
|
54
|
-
<td>${item.
|
|
54
|
+
<td>${item.uuid}</td>
|
|
55
55
|
<td>
|
|
56
56
|
{{if item.uuid }}
|
|
57
57
|
{{if item.private_key}}
|
|
@@ -77,13 +77,13 @@ jQuery(function($){
|
|
|
77
77
|
<table class="ptn08" frame="void" cellpadding="0" cellspacing="0" border="0">
|
|
78
78
|
<tr>
|
|
79
79
|
<td class="padcell"></td>
|
|
80
|
-
<td class="title"><%= t('keypairs.details.
|
|
81
|
-
<td colspan="7">${item.
|
|
80
|
+
<td class="title"><%= t('keypairs.details.uuid') %>:</td>
|
|
81
|
+
<td colspan="7">${item.uuid}</td>
|
|
82
82
|
</tr>
|
|
83
83
|
<tr>
|
|
84
84
|
<td class="padcell"></td>
|
|
85
85
|
<td class="title"><%= t('keypairs.details.fingerprint') %>:</td>
|
|
86
|
-
|
|
86
|
+
<td colspan="7">${item.finger_print}</td>
|
|
87
87
|
</tr>
|
|
88
88
|
<tr>
|
|
89
89
|
<td class="padcell"></td>
|
|
@@ -21,18 +21,18 @@ jQuery(function($){
|
|
|
21
21
|
|
|
22
22
|
<div id="mainarea_wide">
|
|
23
23
|
<h3><img src="images/icon_resource.gif" /><%= t("security_groups.header") %><a href="javascript:void(0);" class="showhide"></a></h3>
|
|
24
|
-
|
|
24
|
+
<div id="list_load_mask" class="maincontent">
|
|
25
25
|
<div class="controller clearfix">
|
|
26
|
-
|
|
26
|
+
<a href="javascript:void(0);" class="create_security_group"><%= t("security_groups.button.create_security_group") %></a>
|
|
27
27
|
<a href="javascript:void(0);" class="delete_security_group" ><%= t("security_groups.button.delete_security_group") %></a>
|
|
28
28
|
<a href="javascript:void(0);" class="refresh" style="margin-left:585px"><%= t("button.refresh") %></a>
|
|
29
29
|
</div>
|
|
30
30
|
<div class="controller clearfix">
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
<div id="pagenate" class="r_float">
|
|
32
|
+
<a href="javascript:void(0);" class="prev"></a>
|
|
33
33
|
<p id="viewPagenate"></p>
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
<a href="javascript:void(0);" class="next"></a>
|
|
35
|
+
</div>
|
|
36
36
|
</div>
|
|
37
37
|
<div id="display_security_groups" class="display_area">
|
|
38
38
|
<% content_for :javascript_template do %>
|
|
@@ -45,15 +45,15 @@ jQuery(function($){
|
|
|
45
45
|
<th><%= t("security_groups.list.action") %></th>
|
|
46
46
|
</tr>
|
|
47
47
|
{{each(index,item) rows}}
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
<tr>
|
|
49
|
+
{{if item.uuid }}
|
|
50
50
|
<td class="listradiobutton"><input id="${item.uuid}" type="radio" name="select" value="${item.uuid}" ></td>
|
|
51
51
|
{{else}}
|
|
52
52
|
<td class="listradiobutton"></td>
|
|
53
53
|
{{/if}}
|
|
54
|
-
<td class="vtip" title="
|
|
54
|
+
<td class="vtip" title="uuid" style="width:130px">${item.uuid}</td>
|
|
55
55
|
<td class="vtip" title="description" style="width:500px">${item.description}</td>
|
|
56
|
-
{{if item.
|
|
56
|
+
{{if item.uuid }}
|
|
57
57
|
<td class="vtip center" title="action">
|
|
58
58
|
<a href="javascript:void(0);" class="edit_security_group" id="edit_${item.uuid}"><%= t("security_groups.button.edit_security_group") %></a>
|
|
59
59
|
</td>
|
|
@@ -78,7 +78,7 @@ jQuery(function($){
|
|
|
78
78
|
<tr>
|
|
79
79
|
<td class="padcell"></td>
|
|
80
80
|
<td class="title"><%= t("security_groups.details.name") %>:</td>
|
|
81
|
-
<td>${item.
|
|
81
|
+
<td>${item.uuid}</td>
|
|
82
82
|
</tr>
|
|
83
83
|
<tr>
|
|
84
84
|
<td class="padcell"></td>
|
|
File without changes
|
|
@@ -1,32 +1,25 @@
|
|
|
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
|
-
<%= text_field_tag 'login', @login %></p>
|
|
26
|
-
<p style="margin:5px;padding:5px;font-size:15px"><%= label_tag t("login.password") %><br />
|
|
27
|
-
<%= password_field_tag 'password', nil %></p>
|
|
28
|
-
<fieldset>
|
|
29
|
-
<p><%= submit_tag 'login' %></p>
|
|
30
|
-
<% end -%>
|
|
31
|
-
</div>
|
|
1
|
+
<div id="signin">
|
|
2
|
+
<div id="signin_sidemenu">
|
|
3
|
+
<div id="signin_form">
|
|
4
|
+
<%= form_tag session_path do -%>
|
|
5
|
+
<fieldset>
|
|
6
|
+
<legend><h3><%= t("login.sign_in") %></h3></legend>
|
|
7
|
+
<% if @error_message %>
|
|
8
|
+
<div id="error_box">
|
|
9
|
+
<div id="error_message"><%= @error_message %></div>
|
|
10
|
+
</div>
|
|
11
|
+
<% end %>
|
|
12
|
+
<p><%= label_tag t("login.user") %><br />
|
|
13
|
+
<%= text_field_tag 'login', @login %></p>
|
|
14
|
+
<p><%= label_tag t("login.password") %><br />
|
|
15
|
+
<%= password_field_tag 'password', nil %></p>
|
|
16
|
+
</fieldset>
|
|
17
|
+
<p><%= submit_tag 'Login' %></p>
|
|
18
|
+
<% end -%>
|
|
19
|
+
</div>
|
|
20
|
+
</div>
|
|
21
|
+
<div id="signin_main">
|
|
22
|
+
<iframe src="/sessions/information.html" name="information" width="718" height="496">
|
|
23
|
+
</iframe>
|
|
24
|
+
</div>
|
|
32
25
|
</div>
|
|
@@ -97,6 +97,9 @@
|
|
|
97
97
|
<td class="padcell"></td>
|
|
98
98
|
<td class="title"><%= t("snapshots.details.destination") %>:</td>
|
|
99
99
|
<td class="state">${item.destination_name}</td>
|
|
100
|
+
<td class="padcell"></td>
|
|
101
|
+
<td class="title"><%= t("snapshots.details.backing_store") %>:</td>
|
|
102
|
+
<td class="state">${item.backing_store}</td>
|
|
100
103
|
</tr>
|
|
101
104
|
<tr>
|
|
102
105
|
<td class="padcell"></td>
|