Merge pull request #21 from pmsipilot/add_ip

Add IP adress in administration page

Author: wixyvir

backend/demoinstance/database.py

@@ -38,6 +38,7 @@ class Instance(Base):
     name = Column(String(255))
     image_key = Column(String(255))
     status = Column(String(255), nullable=False)
+    ip = Column(String(255), nullable=True)
     launched_at = Column(types.DATETIME)
     life_time = Column(types.Integer, nullable=False)
     token = Column(String(255), nullable=False)

backend/demoinstance/demo.py

@@ -148,7 +148,8 @@ def create_pool_instance(self, image_key):
 
     def instance_is_up(self, instance_id):
         if self.provider.instance_is_up(instance_id):
-            self.database_insert_server(instance_id, 'UP')
+            self.database_insert_server(instance_id, 'UP',
+                                        ip=self.provider.get_instance_ip(instance_id))
             return True
         return False
 
@@ -173,7 +174,7 @@ def check_system_up(self, instance_id):
     # DATABASE #
     def database_insert_server(self, instance_id, status=None,
                                launched_at=None, life_time=None,
-                               image_key=None, token=None):
+                               image_key=None, token=None, ip=None):
         logging.debug('Insert instance %s', instance_id)
 
         query = self.database.query(Instance).filter(
@@ -189,6 +190,9 @@ def database_insert_server(self, instance_id, status=None,
         data_instance.provider_id = instance_id
         data_instance.status = status
 
+        if ip:
+            data_instance.ip = ip
+        
         if image_key:
             data_instance.image_key = image_key
 
@@ -377,6 +381,7 @@ def get_active_instance_database(self):
                 'id': instance.provider_id,
                 'status': instance.status,
                 'type': instance.image_key,
+                'ip': instance.ip,
                 'launched_at': str(instance.launched_at),
                 'life_time': instance.life_time,
                 'user': login,

frontend/pages/admin.html

@@ -49,6 +49,13 @@
                      ng-click="tableParams.sorting({'dead_time' : tableParams.isSortBy('dead_time', 'asc') ? 'desc' : 'asc'})">
                     {{ 'INSTANCE_DEAD_TIME'|translate }}
                 </th>
+                <th  class="sortable" ng-class="{
+                    'sort-asc': tableParams.isSortBy('ip', 'asc'),
+                    'sort-desc': tableParams.isSortBy('ip', 'desc')
+                  }"
+                     ng-click="tableParams.sorting({'ip' : tableParams.isSortBy('ip', 'asc') ? 'desc' : 'asc'})">
+                    {{ 'INSTANCE_IP'|translate }}
+                </th>
                 <th>
                     {{ 'INSTANCE_ACTIONS'|translate }}
                 </th>
@@ -62,6 +69,7 @@
                 <td data-title="'launched_at'" sortable="'launched_at'">{{ instance.launched_at }}</td>
                 <td data-title="'life_time'" sortable="'life_time'"> <a href="#" editable-number="instance.life_time" onaftersave="addTimeInstance(instance)">{{ instance.life_time }}</a></td>
                 <td data-title="'dead_time'" sortable="'dead_time'">{{ instance.dead_time }}</td>
+		<td data-title="'ip'" sortable="'dead_time'">{{ instance.ip }}</td>
                 <td data-title="'action'">
                     <span ng-show="instance.status != 'DELETED'" ng-click="setInstance(instance)" data-toggle="modal" data-target="#modalDestroy" class="glyphicon glyphicon-remove"></span>
                     <span ng-show="instance.status != 'DELETED'" ng-click="go_to_instance(instance)" class="glyphicon glyphicon glyphicon-eye-open"></span>
@@ -131,4 +139,4 @@ <h4 class="modal-title" id="myModalLabel">{{ 'DESTROY' | translate }}</h4>
             </div>
         </div>
     </div>
-</div>
+</div>

frontend/script.js

@@ -119,6 +119,7 @@
             INSTANCE_LAUNCHED_AT: 'Startup time',
             INSTANCE_LIFE_TIME: 'Life time  (min.)',
             INSTANCE_DEAD_TIME: 'Time before remove (min.)',
+            INSTANCE_IP: 'IP',
             INSTANCE_ACTIONS: 'Actions',
 
             INSTANCE_TYPE : 'Type',
@@ -161,6 +162,7 @@
             INSTANCE_LAUNCHED_AT: 'Jour / heure de démarrage',
             INSTANCE_LIFE_TIME: 'Durée de vie (min.)',
             INSTANCE_DEAD_TIME: 'Durée avant destruction (min.)',
+            INSTANCE_IP: 'IP',
             INSTANCE_ACTIONS: 'Actions',
 
             INSTANCE_TYPE : 'Type',