实现保留 IP 功能

docs/todo.md

@@ -100,6 +100,6 @@
 - [ ] 邮局设置从配置文件提取到JimV系统配置中
 - [x] 当计算节点失联后，相应的虚拟机状态标识为"未知"状态
 - [ ] 替换热迁移时计算节点的主机名为 IP 地址
-- [ ] IP 黑名单(可用作 VIP 场景)
+- [x] 保留 IP 列表(可用作 VIP 场景)
 - [x] IP 修正功能
 

jimvc/__init__.py

@@ -54,6 +54,8 @@ from jimvc.api.disk import blueprints as disk_blueprints
 from jimvc.api.config import blueprint as config_blueprint
 from jimvc.api.ip_pool import blueprint as ip_pool_blueprint
 from jimvc.api.ip_pool import blueprints as ip_pool_blueprints
+from jimvc.api.reserved_ip import blueprint as reserved_ip_blueprint
+from jimvc.api.reserved_ip import blueprints as reserved_ip_blueprints
 from jimvc.api.log import blueprint as log_blueprint
 from jimvc.api.log import blueprints as log_blueprints
 from jimvc.api.host import blueprint as host_blueprint
@@ -265,6 +267,8 @@ try:
     app.register_blueprint(config_blueprint)
     app.register_blueprint(ip_pool_blueprint)
     app.register_blueprint(ip_pool_blueprints)
+    app.register_blueprint(reserved_ip_blueprint)
+    app.register_blueprint(reserved_ip_blueprints)
     app.register_blueprint(log_blueprint)
     app.register_blueprint(log_blueprints)
     app.register_blueprint(host_blueprint)

jimvc/api/reserved_ip.py

@@ -51,6 +51,10 @@ def r_create():
         ret = dict()
         ret['state'] = ji.Common.exchange_state(20000)
 
+        if reserved_ip.exist_by('ip'):
+            ret['state'] = ji.Common.exchange_state(40901)
+            return ret
+
         reserved_ip.create()
 
         reserved_ip.get()

jimvc/themes/default/templates/config_show.html

@@ -62,6 +62,16 @@
                     put_ip_pool_activity($(this).data('id'));
                 }
             });
+
+            $('#reserved_ip_modal').on('show.bs.modal', function (me) {
+                reserved_ip_refresh();
+            });
+
+            $("#reserved_ip_input").keydown(function() {
+                if (event.keyCode == "13") {//keyCode=13是回车键
+                    add_reserved_ip($('#reserved_ip_input').val())
+                }
+            });
         });
 
         function refresh() {
@@ -343,7 +353,7 @@
                 '        <div class="pull-right">\n' +
                 '            <button class="btn btn-default" onclick="window.location.reload();" style="border-radius: 0;"><span class="glyph-icon icon-elusive-arrows-cw"></span></button>\n' +
                 '            <a class="btn btn-info" href="javascript:;" data-toggle="modal" data-target="#add_ip_pool_modal" style="border-radius: 0; padding-left: 40px; padding-right: 40px;">添加 IP 池</a>\n' +
-                '            <a class="btn btn-black" href="javascript:;" data-toggle="modal" data-target="#ip_black_list_modal" style="border-radius: 0; padding-left: 40px; padding-right: 40px; color: white;">保留 IP</a>\n' +
+                '            <a class="btn btn-black" href="javascript:;" data-toggle="modal" data-target="#reserved_ip_modal" style="border-radius: 0; padding-left: 40px; padding-right: 40px; color: white;">保留 IP</a>\n' +
                 '        </div>\n' +
                 '    </div>\n' +
                 '</div>';
@@ -506,6 +516,90 @@
                 }
             });
         }
+
+        function row_onmouseover(me) {
+            $(me).find(".delete_reserved_ip_trigger").css('display','inline-flex');
+        }
+
+        function row_onmouseout(me) {
+            $(me).find(".delete_reserved_ip_trigger").css('display','none');
+        }
+
+        function add_reserved_ip(ip) {
+            $.ajax({
+                url : '/api/reserved_ip',
+                type : 'POST',
+                contentType: "application/json; charset=utf-8",
+                async: false,
+                dataType: "json",
+                data : JSON.stringify({ip: ip}),
+                error : function(data, textStatus, xhr) {
+                    alter_danger(data.responseText);
+                    alter_warning('添加保留 IP 失败！');
+                },
+                success : function(data, textStatus, xhr) {
+                    var html = '<tr role="row" data-id="' + data['data']['id'] + '" class="odd" onmouseover="row_onmouseover(this);" onmouseout="row_onmouseout(this);">\n' +
+                        '    <td class="text-center">\n' +
+                        data['data']['ip'] +
+                        '        <div style="display: inline;">\n' +
+                        '            <a href="javascript:;" class="delete_reserved_ip_trigger" style="display: none; float: right;">\n' +
+                        '                <span onclick="reserved_ip_delete(this);" class="glyph-icon icon-iconic-cancel" style="width: 20px; height: 20px; margin-left: 10px; border-radius: 0; color: indianred;"></span>\n' +
+                        '            </a>\n' +
+                        '        </div>\n' +
+                        '    </td>\n' +
+                        '</tr>';
+                    $('#reserved_ip_table tbody').append(html);
+                    alter_success('添加保留 IP 成功！');
+                }
+            });
+        }
+        
+        function reserved_ip_refresh() {
+            $.ajax({
+                url : '/api/reserved_ips',
+                type : 'GET',
+                contentType: "application/json; charset=utf-8",
+                dataType: 'json',
+                async: false,
+                error : function() {
+                },
+                success : function(data, textStatus, xhr) {
+                    var html = NaN;
+                    $('#reserved_ip_table tbody').empty();
+                    $.each(data.data, function(k, v) {
+                        html = '<tr role="row" data-id="' + v['id'] + '" class="odd" onmouseover="row_onmouseover(this);" onmouseout="row_onmouseout(this);">\n' +
+                        '    <td class="text-center">\n' +
+                        v['ip'] +
+                        '        <div style="display: inline;">\n' +
+                        '            <a href="javascript:;" class="delete_reserved_ip_trigger" style="display: none; float: right;">\n' +
+                        '                <span onclick="reserved_ip_delete(this);" class="glyph-icon icon-iconic-cancel" style="width: 20px; height: 20px; margin-left: 10px; border-radius: 0; color: indianred;"></span>\n' +
+                        '            </a>\n' +
+                        '        </div>\n' +
+                        '    </td>\n' +
+                        '</tr>';
+                        $('#reserved_ip_table tbody').append(html);
+                    });
+                }
+            });
+        }
+
+        function reserved_ip_delete(me) {
+            var id = $(me).parent().parent().parent().parent().data('id');
+            $.ajax({
+                url : '/api/reserved_ips/' + id,
+                type : 'DELETE',
+                contentType: "application/json; charset=utf-8",
+                async: false,
+                error : function(data, textStatus, xhr) {
+                    alter_danger(data.responseText);
+                    alter_warning('添加保留 IP 失败！');
+                },
+                success : function(data, textStatus, xhr) {
+                    $('#reserved_ip_table tbody tr[data-id="' +id + '"]').remove()
+                    alter_success('删除保留 IP 成功！');
+                }
+            });
+        }
     </script>
     <div class="panel">
         <div class="panel-body">
@@ -750,7 +844,7 @@
     </div>
 </div>
 
-<div class="modal" id="ip_black_list_modal" tabindex="-1" role="dialog" style="margin-top: 100px;">
+<div class="modal" id="reserved_ip_modal" tabindex="-1" role="dialog" style="margin-top: 100px;">
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
             <div class="modal-header">
@@ -761,24 +855,21 @@
             </div>
             <div class="modal-body" style="padding-top: 0; padding-bottom: 0;">
                 <div class="example-box-wrapper">
-                    <form id="ssh_key_bind_form" class="form-horizontal bordered-row" action="javascript;">
+                    <form id="reserved_ip_form" class="form-horizontal bordered-row" action="javascript:;">
                         <div class="form-group">
                             <div class="col-sm-1"></div>
-                            <div class="col-sm-10">
-                                <div id="reserved_ip_list" class="list-group" style="text-align: center;">
-                                    <a href="#" class="list-group-item list-group-item-action">192.168.1.1</a>
-                                    <a href="#" class="list-group-item list-group-item-action">192.168.1.1</a>
-                                    <a href="#" class="list-group-item list-group-item-action">192.168.1.1</a>
-                                    <a href="#" class="list-group-item list-group-item-action">192.168.1.1</a>
-                                    <a href="#" class="list-group-item list-group-item-action">192.168.1.1</a>
-                                </div>
+                            <div class="col-sm-10" style="height: 300px; overflow: auto;">
+                                <table id="reserved_ip_table" class="table table-bordered table-hover" cellspacing="0" width="100%" role="grid"
+                                       style="width: 100%; margin-bottom: 0;">
+                                    <tbody></tbody>
+                                </table>
                             </div>
                             <div class="col-sm-1"></div>
                         </div>
                         <div class="form-group">
                             <div class="col-sm-1"></div>
                             <div class="col-sm-10">
-                                <input class="form-control" style="text-align: center;" type="text" placeholder="将要保留的 IP">
+                                <input id="reserved_ip_input" class="form-control" style="text-align: center;" type="text" placeholder="将要保留的 IP">
                             </div>
                             <div class="col-sm-1"></div>
                         </div>

jimvc/themes/default/templates/ssh_keys_show.html

@@ -709,7 +709,7 @@
             </div>
             <div class="modal-body" style="padding-top: 0; padding-bottom: 0;">
                 <div class="example-box-wrapper">
-                    <form id="ssh_key_bind_form" class="form-horizontal bordered-row" action="javascript;">
+                    <form id="ssh_key_bind_form" class="form-horizontal bordered-row" action="javascript:;">
                         <div class="form-group">
                             <div class="col-sm-1"></div>
                             <div class="col-sm-10">
@@ -739,7 +739,7 @@
             </div>
             <div class="modal-body" style="padding-top: 0; padding-bottom: 0;">
                 <div class="example-box-wrapper">
-                    <form id="ssh_key_unbind_form" class="form-horizontal bordered-row" action="javascript;">
+                    <form id="ssh_key_unbind_form" class="form-horizontal bordered-row" action="javascript:;">
                         <div class="form-group">
                             <div class="col-sm-1"></div>
                             <div class="col-sm-10">