add instanceId to eni tab

cookpad · Mar 25, 2012 · 64fad7b · 64fad7b
1 parent 15b90db
commit 64fad7b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/ec2ui/content/ec2ui/controller.js b/ec2ui/content/ec2ui/controller.js
@@ -2818,8 +2818,15 @@ var ec2ui_controller = {
 
             groupList.sort();
 
+            var instanceId = null;
+            var attachment = item.getElementsByTagName('attachment')[0];
+
+            if (attachment) {
+              var instanceId = getNodeValueByName(attachment, 'instanceId');
+            }
+
             list.push(new NetworkInterface(networkInterfaceId, subnetId, vpcId, availabilityZone, description,
-                                           ownerId, requesterManaged, status, macAddress, privateIpAddress, sourceDestCheck, groupList));
+                                           ownerId, requesterManaged, status, macAddress, privateIpAddress, sourceDestCheck, groupList, instanceId));
 
         }
 

diff --git a/ec2ui/content/ec2ui/eni_tab_overlay.xul b/ec2ui/content/ec2ui/eni_tab_overlay.xul
@@ -71,6 +71,9 @@
           <treecol id="eni.groups" label="Security Groups" flex="1" sortDirection="ascending"
             persist="width ordinal hidden sortDirection" />
           <splitter class="tree-splitter" />
+          <treecol id="eni.instanceId" label="Instances ID" flex="1" sortDirection="ascending"
+            persist="width ordinal hidden sortDirection" />
+          <splitter class="tree-splitter" />
         </treecols>
         <treechildren context="ec2ui.eni.contextmenu" />
       </tree>

diff --git a/ec2ui/content/ec2ui/eniview.js b/ec2ui/content/ec2ui/eniview.js
@@ -12,6 +12,7 @@ var ec2ui_ENITreeView = {
         'eni.privateIpAddress',
         'eni.sourceDestCheck',
         'eni.groups',
+        'eni.instanceId',
     ],
 
     treeBox : null,

diff --git a/ec2ui/content/ec2ui/model.js b/ec2ui/content/ec2ui/model.js
@@ -136,7 +136,8 @@ function InstanceStatusEvent(instanceId, availabilityZone, code, description, st
 }
 
 function NetworkInterface(networkInterfaceId, subnetId, vpcId, availabilityZone, description,
-                          ownerId, requesterManaged, status, macAddress, privateIpAddress, sourceDestCheck, groupList) {
+                          ownerId, requesterManaged, status, macAddress, privateIpAddress, sourceDestCheck,
+                          groupList, instanceId) {
     this.networkInterfaceId = networkInterfaceId;
     this.subnetId           = subnetId;
     this.vpcId              = vpcId;
@@ -150,6 +151,7 @@ function NetworkInterface(networkInterfaceId, subnetId, vpcId, availabilityZone,
     this.sourceDestCheck    = sourceDestCheck;
     this.groupList          = groupList;
     this.groups = this.groupList.sort().join(', ');
+    this.instanceId         = instanceId;
 }
 
 function SecurityGroup(ownerId, name, description, permissions, vpcId, groupId) {