From c69ed656201d8699b2de0523392090890cf5b8c1 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Sat, 1 Dec 2018 17:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=B1=A0IP=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?IP=E6=A0=BC=E5=BC=8F=E9=80=89=E9=A1=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../20181201/update_function_region_dict.sql  |  6 ++
 .../20181201/update_ip_reuse_addr_pool.sql    |  2 +
 .../maintenance/ipMultiplexPool/snatform2.jsp | 79 +++++++++++--------
 3 files changed, 52 insertions(+), 35 deletions(-)
 create mode 100644 src/main/resources/sql/20181201/update_function_region_dict.sql
 create mode 100644 src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql

diff --git a/src/main/resources/sql/20181201/update_function_region_dict.sql b/src/main/resources/sql/20181201/update_function_region_dict.sql
new file mode 100644
index 000000000..7b5aa9175
--- /dev/null
+++ b/src/main/resources/sql/20181201/update_function_region_dict.sql
@@ -0,0 +1,6 @@
+UPDATE 
+	function_region_dict
+SET 
+	config_ip_pattern = '1,3'
+WHERE
+	dict_id = 231 AND function_id = 633;
\ No newline at end of file
diff --git a/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql b/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql
new file mode 100644
index 000000000..5962129b3
--- /dev/null
+++ b/src/main/resources/sql/20181201/update_ip_reuse_addr_pool.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ip_reuse_addr_pool DROP COLUMN addr_pool_id;
+ALTER TABLE ip_reuse_addr_pool DROP COLUMN available_ip_total;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
index 74667f4a9..66ccbae35 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
@@ -29,10 +29,13 @@ $(function(){
 		},
 		errorContainer: "#messageBox"
 	});
-	//switchIpInfo($("select[name$='ipType']"));
+	
 	$("select[name$='ipType']").on("change",function(){
 		switchIpInfo(this);
 	}); 
+	$("select[name$='ipPattern']").on("change",function(){
+		switchIpInfo(this); 
+	});
 	
 	ipInfoDiv.removeClass("ipDiv");
 	ipInfoDiv.removeClass("hidden");
@@ -56,6 +59,9 @@ var resetDiv = function(obj){
 	$("select[name$='ipType']").on("change",function(){
 		switchIpInfo(this); 
 	});
+	$("select[name$='ipPattern']").on("change",function(){
+		switchIpInfo(this); 
+	});
 	resetIndex();
 }
 
@@ -172,13 +178,14 @@ var resetIndex = function(){
 										<div class="form-group">
 											<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
 											<div class="col-md-6">
-												<form:textarea path="description" htmlEscape="false" maxlength="128" class="form-control" />
+												<form:textarea path="description" htmlEscape="false" rows="1" maxlength="128" class="form-control" />
 											</div>
 										</div>
 									</div>
 								</div>
 								
 								<div class="row ipInfo ipDiv <c:if test="${!empty _cfg.ipCfgs}">hidden</c:if>">							
+									<h5 class="page-header"></h5>
 									<input type="hidden" name="ipCfgs[0].protocolId" value="0">
 									<div class="row">
 									    <div class="col-md-6">
@@ -196,21 +203,7 @@ var resetIndex = function(){
 									            <div for="ipCfgs[0].ipType"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
-									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-															<option value="${ipPatternC.itemCode}">
-																<spring:message code="${ipPatternC.itemValue}"/>
-															</option>
-								              			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="ipCfgs[0].ipPattern"></div>
-									        </div>
-									    </div>
+									    
 									    <div class="col-md-6">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
@@ -228,6 +221,21 @@ var resetIndex = function(){
 									</div>
 									
 									<div class="row port">
+										<div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
+									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+															<option value="${ipPatternC.itemCode}">
+																<spring:message code="${ipPatternC.itemValue}"/>
+															</option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipCfgs[0].ipPattern"></div>
+									        </div>
+									    </div>
 									    <div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
@@ -313,6 +321,7 @@ var resetIndex = function(){
 								
 								<c:forEach items="${_cfg.ipCfgs }" var="ipCfg" varStatus="index">
 									<div class="row ipInfo">
+									<h5 class="page-header"></h5>
 									<input type="hidden" name="ipCfgs[0].protocolId" value="0">
 									<div class="row">
 									    <div class="col-md-6">
@@ -333,24 +342,6 @@ var resetIndex = function(){
 									            <div for="ipCfgs[0].ipType"></div>
 									        </div>
 									    </div>
-									    <div class="col-md-6 hidden">
-									        <div class="form-group">
-									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-									            <div class="col-md-6">
-									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
-									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-															<option value="${ipPatternC.itemCode}" 
-																<c:if test="${ipCfg.ipPattern == ipPatternC.itemCode}">
-																	selected
-																</c:if>>
-																<spring:message code="${ipPatternC.itemValue}"/>
-															</option>
-								              			</c:forEach>
-									                 </select>
-									            </div>
-									            <div for="ipCfgs[0].ipPattern"></div>
-									        </div>
-									    </div>
 									    <div class="col-md-6">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
@@ -368,6 +359,24 @@ var resetIndex = function(){
 									</div>
 									
 									<div class="row port">
+										<div class="col-md-6">
+									        <div class="form-group">
+									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+									            <div class="col-md-6">
+									            	 <select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
+									                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+															<option value="${ipPatternC.itemCode}" 
+																<c:if test="${ipCfg.ipPattern == ipPatternC.itemCode}">
+																	selected
+																</c:if>>
+																<spring:message code="${ipPatternC.itemValue}"/>
+															</option>
+								              			</c:forEach>
+									                 </select>
+									            </div>
+									            <div for="ipCfgs[0].ipPattern"></div>
+									        </div>
+									    </div>
 									    <div class="col-md-6 hidden">
 									        <div class="form-group">
 									            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>