Index: /branches/amp_3_7/extensions/license_server/webui/client/device/device.controller.js =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/client/device/device.controller.js (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/client/device/device.controller.js (working copy) @@ -144,7 +144,11 @@ $rootScope.$broadcast('endLoading', true); if (res&&res.status === 200) { if (res.data[0]) { - vmDeviceTableView.refresh(); + $rootScope.TipService.setMessage('The license settings has been updated successfully. Please allow a few seconds for the changes to take effect.'); + setTimeout(function(){ + $rootScope.TipService.clear(); + vmDeviceTableView.refresh(); + }, 15000); } else { $rootScope.TipService.setMessage(res.data[1]); } @@ -164,7 +168,11 @@ $rootScope.$broadcast('endLoading', true); if (res&&res.status === 200) { if (res.data[0]) { - vmDeviceTableView.refresh(); + $rootScope.TipService.setMessage('The license settings has been updated successfully. Please allow a few seconds for the changes to take effect.'); + setTimeout(function(){ + $rootScope.TipService.clear(); + vmDeviceTableView.refresh(); + }, 15000); } else { $rootScope.TipService.setMessage(res.data[1]); } Index: /branches/amp_3_7/extensions/license_server/webui/client/device/device_default.html =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/client/device/device_default.html (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/client/device/device_default.html (working copy) @@ -1,72 +1,107 @@ -
-
- - - -
-
-
- - -
+
+
+ + + +
+
+
+ +
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
No.{{'ip'|T}}{{'Product Name'|T}}{{'Serial Name'|T}}{{'Connection'|T}}{{'License'|T}}{{'Status'|T}}{{'Bandwidth Mode'|T}}{{'Assigned Bandwidth'|T}}{{'Applied Bandwidth'|T}}{{'Real-time Bandwidth'|T}}{{'Action'|T}}
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.ip}}{{row.product_name}}{{row.serial_number}} - - - {{row.license_name.length ? row.license_name : 'N/A'}} - - - {{row.auto_bw ? 'Auto' : 'Manually'}}{{row.bw_limit ? row.bw_limit : 'N/A'}}{{row.perbw}}Current: {{row.rel_bandwith.current}}
Dropped: {{row.rel_bandwith.dropped}}
Limitation: {{row.rel_bandwith.limitation}}		 - - - - -
-
-
-
-
- -
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
No.{{'IP Address'|T}}{{'Product Name'|T}}{{'Connection'|T}}{{'License'|T}}{{'Status'|T}}{{'Bandwidth Mode'|T}}{{'Assigned Bandwidth'|T}}{{'Applied Bandwidth'|T}}{{'Real-time Bandwidth'|T}}{{'Action'|T}}
+ +
{{ ((currentPageIndex - 1) * pageSize) + $index + 1 }}{{row.ip}}{{row.product_name}} + + + + Name: {{row.license_name}}
Total: {{row.total_bw}} Mbps
Allocated: {{row.used_bw}} Mbps + N/A + 		+ + + {{row.auto_bw ? 'Auto' : 'Manually'}}{{row.bw_limit ? row.bw_limit + ' Mbps' : 'N/A'}}{{row.perbw}}Current: {{row.rel_bandwith.current}}
Dropped: {{row.rel_bandwith.dropped}}
Limitation: + {{row.rel_bandwith.limitation}} + 		+ + + + +
+
+
+
+
+
- -
-
\ No newline at end of file +
+ +
+
Index: /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.controller.js =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.controller.js (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/client/device/edit-device-resource.controller.js (working copy) @@ -42,12 +42,16 @@ $rootScope.$broadcast('endLoading', true); if (res&&res.status === 200) { if (res.data[0]) { + $rootScope.TipService.setMessage('The license settings has been updated successfully. Please allow a few seconds for the changes to take effect.'); + setTimeout(function(){ + $rootScope.TipService.clear(); + }, 15000); $uibModalInstance.close(true); } else { $rootScope.TipService.setMessage(res.data[1]); } } else { - $rootScope.TipService.setMessage($filter('T')('Failed to edit device reosurce mode!')); + $rootScope.TipService.setMessage($filter('T')('Failed to edit device resource mode!')); } }); } Index: /branches/amp_3_7/extensions/license_server/webui/client/license/license.html =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/client/license/license.html (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/client/license/license.html (working copy) @@ -23,10 +23,11 @@ {{'Generation Date'|T}} {{'Expiration Date'|T}} - {{'Bandwith Limitation'|T}} + {{'Bandwidth Limitation'|T}} + {{'Available bandwidth'|T}} + {{'Allocated bandwidth'|T}} {{'vAPV Capacity'|T}} {{'Memory Control'|T}} - {{'Max available bandwidth'|T}} {{'Action'|T}} @@ -39,9 +40,10 @@ {{row.generation_date}} {{row.expiration_date}} {{row.bandwidth}} + {{row.available_bw}} Mbps + {{row.used_bw}} Mbps {{row.capacity}} {{row.memory_control}} - {{row.bwlimit}} Index: /branches/amp_3_7/extensions/license_server/webui/model/cm_device/__init__.py =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/model/cm_device/__init__.py (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/model/cm_device/__init__.py (working copy) @@ -22,6 +22,8 @@ product_name = CharField(verbose_name="Product Name", editable=False, configurable=False, optional=True) perbw = CharField(verbose_name="Assigned Bandwidth", editable=False, configurable=False, optional=True) + used_bw = CharField(verbose_name="Used Bandwidth", editable=False, configurable=False, optional=True) + total_bw = CharField(verbose_name="Total Bandwidth", editable=False, configurable=False, optional=True) connection = CharField(verbose_name="Connection", editable=False, configurable=False, optional=True, custom_display=lambda val: ' ' if str(val) == 'connected' else ' ') status = CharField(verbose_name="Status", editable=False, configurable=False, optional=True, custom_display=lambda val: ' ' if str(val) == 'enabled' else ' ') license_name = AssoField2(verbose_name=_('License'), tgt='device_mgmt.license.VolumeLicense.device', @@ -147,11 +149,16 @@ class Manager(CLIManager): def _get_query_set(self): db = DB.get_connected_db() - fetchall_sql = '''SELECT * FROM device2''' + fetchall_sql = ''' + select d1.*, l3.used_bw, l3.total_bw from device2 as d1 left join + (select l2.name, l1.used_bw, l2.bandwidth as total_bw from license as l2 left join + (select license_name, sum(perbw) as used_bw from device2 group by device2.license_name) l1 + on l1.license_name = l2.name) l3 on d1.license_name = l3.name; + ''' data = db.fetchall(fetchall_sql) db.close() result = [] - key = ['id', 'ip', 'restapi_port', 'restapi_username', 'restapi_password', 'connection', 'status', 'version', 'license_name', 'perbw', 'error_msg', 'rel_bandwith', 'bw_limit', 'auto_bw', 'restapi_protocol'] + key = ['id', 'ip', 'restapi_port', 'restapi_username', 'restapi_password', 'connection', 'status', 'version', 'license_name', 'perbw', 'error_msg', 'rel_bandwith', 'bw_limit', 'auto_bw', 'restapi_protocol', 'used_bw', 'total_bw'] result = [dict(zip(key, each)) for each in data] # result = [ # { @@ -183,7 +190,7 @@ rtn = cli_parse(replace_result, [ RegexParser('Limitation: (.+?) bits/sec Current: (.+?) bits/sec Last30s-dropped: (.+?) bits', MATCHONE), ]) - each['rel_bandwith'] = {'limitation': str(int(rtn[0][0])/1024/1024)+' Mbps', 'current': rtn[0][1]+ ' bits/sec', 'dropped': rtn[0][2] + ' bits'} + each['rel_bandwith'] = {'limitation': str(int(rtn[0][0])/1024/1024)+' Mbps', 'current': str(round(float(rtn[0][1])/1024/1024, 2))+' Mbps', 'dropped': str(round(float(rtn[0][2])/1024/1024, 2)) + ' Mbps'} else: each['rel_bandwith'] = {'limitation': 'Restricted', 'current': 'Restricted', 'dropped': 'Restricted'} if each['status'] in ['active', 'inactive']: Index: /branches/amp_3_7/extensions/license_server/webui/model/license/__init__.py =================================================================== --- /branches/amp_3_7/extensions/license_server/webui/model/license/__init__.py (revision 2452) +++ /branches/amp_3_7/extensions/license_server/webui/model/license/__init__.py (working copy) @@ -15,7 +15,10 @@ bwlimit = IntegerField(verbose_name="Max available bandwidth", configurable=False, optional=True, editable=True, unit_name=__('Mbps')) capacity = IntegerField(verbose_name="vAPV Capacity", configurable=False, optional=True, editable=True) memory_control = CharField(verbose_name="vAPV Memory Type Number", configurable=False, optional=True, editable=True) - + available_bw = IntegerField(verbose_name="Available bandwidth", configurable=False, optional=True, editable=True, + unit_name=__('Mbps')) + used_bw = IntegerField(verbose_name="Used bandwidth", configurable=False, optional=True, editable=True, + unit_name=__('Mbps')) managed_devices_info = FieldGroup(writable=False, verbose_name='Managed Devices', level=BASIC, visible_edit=True, fields={ 'device': AssoField2(verbose_name='Managed Devices', tgt='device_mgmt.cm_device.CMDevice.license_name', mul='1', pos='left', optional=True), }) @@ -44,10 +47,10 @@ class Manager(CLIManager): def _get_query_set(self): db = DB.get_connected_db() - fetchall_sql = '''SELECT * FROM license''' + fetchall_sql = '''select license.*, dl.used_bw from license left join (select license_name, sum(perbw) as used_bw from device2 group by device2.license_name) dl on license.name = dl.license_name;''' data = db.fetchall(fetchall_sql) db.close() - key = ['name', 'license', 'company_name', 'generation_date', 'expiration_date', 'bandwidth', 'bwlimit', 'capacity', 'memory_resource_control'] + memory_control_column + key = ['name', 'license', 'company_name', 'generation_date', 'expiration_date', 'bandwidth', 'bwlimit', 'capacity', 'memory_resource_control'] + memory_control_column + ['used_bw'] result = [dict(zip(key, each)) for each in data] for each in result: for key, value in each.items(): @@ -65,6 +68,7 @@ del each["memory_resource_control"] for index in memory_control_column: del each[index] + each['available_bw'] = (0 if each['bwlimit'] is None else each['bwlimit']) - (0 if each['used_bw'] is None else each['used_bw']) return QuerySet(self._model, result) def _get_stats(self):