From d907919f99fd747515cf74e527ab70243b43608e Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Mon, 13 Feb 2012 12:56:50 +0100
Subject: [PATCH] feature #1090: Add user and group information to OCCI
 resources

---
 src/cloud/occi/lib/ImageOCCI.rb          | 2 ++
 src/cloud/occi/lib/UserOCCI.rb           | 1 +
 src/cloud/occi/lib/VirtualMachineOCCI.rb | 2 ++
 src/cloud/occi/lib/VirtualNetworkOCCI.rb | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/src/cloud/occi/lib/ImageOCCI.rb b/src/cloud/occi/lib/ImageOCCI.rb
index 7f3f1dec1a..777876fdcd 100755
--- a/src/cloud/occi/lib/ImageOCCI.rb
+++ b/src/cloud/occi/lib/ImageOCCI.rb
@@ -23,6 +23,8 @@ class ImageOCCI < Image
         <STORAGE href="<%= base_url %>/storage/<%= self.id.to_s  %>">
             <ID><%= self.id.to_s %></ID>
             <NAME><%= self.name %></NAME>
+            <USER href="<%= base_url %>/user/<%= self['UID'] %>" name="<%= self['UNAME'] %>"/>
+            <GROUP><%= self['GNAME'] %></GROUP>
             <STATE><%= self.state_str %></STATE>
             <% if self['TYPE'] != nil %>
             <TYPE><%= self.type_str %></TYPE>
diff --git a/src/cloud/occi/lib/UserOCCI.rb b/src/cloud/occi/lib/UserOCCI.rb
index 7c772c139f..fa8a960ef2 100644
--- a/src/cloud/occi/lib/UserOCCI.rb
+++ b/src/cloud/occi/lib/UserOCCI.rb
@@ -27,6 +27,7 @@ class UserOCCI < User
         <USER href="<%= base_url %>/user/<%= self.id.to_s  %>">
             <ID><%= self.id.to_s %></ID>
             <NAME><%= self.name %></NAME>
+            <GROUP><%= self['GNAME'] %></GROUP>
             <QUOTA>
             <% user_quota.each { |key,value|
                 key_s = key.to_s.upcase
diff --git a/src/cloud/occi/lib/VirtualMachineOCCI.rb b/src/cloud/occi/lib/VirtualMachineOCCI.rb
index c04c9cd1bf..4cb8754653 100755
--- a/src/cloud/occi/lib/VirtualMachineOCCI.rb
+++ b/src/cloud/occi/lib/VirtualMachineOCCI.rb
@@ -22,6 +22,8 @@ class VirtualMachineOCCI < VirtualMachine
     OCCI_VM = %q{
         <COMPUTE href="<%= base_url %>/compute/<%= self.id.to_s  %>">
             <ID><%= self.id.to_s%></ID>
+            <USER href="<%= base_url %>/user/<%= self['UID'] %>" name="<%= self['UNAME'] %>"/>
+            <GROUP><%= self['GNAME'] %></GROUP>
             <CPU><%= self['TEMPLATE/CPU'] %></CPU>
             <MEMORY><%= self['TEMPLATE/MEMORY'] %></MEMORY>
             <NAME><%= self.name%></NAME>
diff --git a/src/cloud/occi/lib/VirtualNetworkOCCI.rb b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
index 22cb93901a..68edb59c7f 100755
--- a/src/cloud/occi/lib/VirtualNetworkOCCI.rb
+++ b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
@@ -24,6 +24,8 @@ class VirtualNetworkOCCI < VirtualNetwork
         <NETWORK href="<%= base_url %>/network/<%= self.id.to_s  %>">
             <ID><%= self.id.to_s %></ID>
             <NAME><%= self.name %></NAME>
+            <USER href="<%= base_url %>/user/<%= self['UID'] %>" name="<%= self['UNAME'] %>"/>
+            <GROUP><%= self['GNAME'] %></GROUP>
             <% if self['TEMPLATE/DESCRIPTION'] != nil %>
             <DESCRIPTION><%= self['TEMPLATE/DESCRIPTION'] %></DESCRIPTION>
             <% end %>