deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [3/4] git commit: add FW description to FGCP driver
Date Wed, 23 May 2012 10:42:02 GMT
add FW description to FGCP driver


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/0393c275
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/0393c275
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/0393c275

Branch: refs/heads/master
Commit: 0393c2752bd6edd9f565e29a192b70847e068377
Parents: 7d001b8
Author: Dies Koper <diesk@fast.au.fujitsu.com>
Authored: Sun May 20 12:27:03 2012 +1000
Committer: Michal fojtik <mfojtik@redhat.com>
Committed: Wed May 23 12:37:01 2012 +0200

----------------------------------------------------------------------
 server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/0393c275/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index 4d6f290..64f77b7 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -884,10 +884,11 @@ eofwpxml
           end
         end
 
+        vsys = client.get_vsys_attributes(client.extract_vsys_id(opts[:id]))['vsys'][0]
         firewalls << Firewall.new({
           :id       => opts[:id],
           :name     => fw_name,
-  #        :description => '', # get_efm_configuration 'FW_POLICY' does not return description
+          :description => "#{vsys['vsysName'][0]} [#{vsys['baseDescriptor'][0]}]",
           :owner_id => fw_owner_id,
           :rules    => rules
         })
@@ -900,7 +901,7 @@ eofwpxml
           Firewall.new({
             :id => vsys['vsysId'][0] + '-S-0001',
             :name => fw_name,
-            :description => vsys['baseDescriptor'][0], # should I use vsys' 'description'
instead and introduce something else for baseDescriptor?
+            :description => "#{vsys['vsysName'][0]} [#{vsys['baseDescriptor'][0]}]",
             :owner_id => vsys['creator'][0]
           })
         end


Mime
View raw message