From 22899b7139e6a784408c117c9607054f6b5f5f0a Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 2 Dec 2011 00:07:16 +0100 Subject: [PATCH] feature #863: Moved fw driver to standard pre-post-clean plugins. --- src/vnm_mad/remotes/{fw => }/Firewall.rb | 0 src/vnm_mad/remotes/fw/{firewall => clean} | 16 +++---------- src/vnm_mad/remotes/fw/post | 27 ++++++++++++++++++++++ src/vnm_mad/remotes/fw/pre | 19 +++++++++++++++ 4 files changed, 49 insertions(+), 13 deletions(-) rename src/vnm_mad/remotes/{fw => }/Firewall.rb (100%) rename src/vnm_mad/remotes/fw/{firewall => clean} (86%) create mode 100755 src/vnm_mad/remotes/fw/post create mode 100755 src/vnm_mad/remotes/fw/pre diff --git a/src/vnm_mad/remotes/fw/Firewall.rb b/src/vnm_mad/remotes/Firewall.rb similarity index 100% rename from src/vnm_mad/remotes/fw/Firewall.rb rename to src/vnm_mad/remotes/Firewall.rb diff --git a/src/vnm_mad/remotes/fw/firewall b/src/vnm_mad/remotes/fw/clean similarity index 86% rename from src/vnm_mad/remotes/fw/firewall rename to src/vnm_mad/remotes/fw/clean index ca5507d7f9..95c11359c4 100755 --- a/src/vnm_mad/remotes/fw/firewall +++ b/src/vnm_mad/remotes/fw/clean @@ -17,21 +17,11 @@ #--------------------------------------------------------------------------- # $: << File.dirname(__FILE__) +$: << File.join(File.dirname(__FILE__), "..") -require 'base64' require 'OpenNebulaNetwork' require 'Firewall' -action = ARGV[0] -template = ARGV[1] +fw = OpenNebulaFirewall.from_base64(ARGV[0]) -vm_xml = Base64::decode64(template) - -fw = OpenNebulaFirewall.new(vm_xml) - -case action -when "on" - fw.activate -when "off" - fw.deactivate -end +fw.deactivate diff --git a/src/vnm_mad/remotes/fw/post b/src/vnm_mad/remotes/fw/post new file mode 100755 index 0000000000..6458772e86 --- /dev/null +++ b/src/vnm_mad/remotes/fw/post @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby + +# -------------------------------------------------------------------------- # +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +$: << File.dirname(__FILE__) +$: << File.join(File.dirname(__FILE__), "..") + +require 'OpenNebulaNetwork' +require 'Firewall' + +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.activate diff --git a/src/vnm_mad/remotes/fw/pre b/src/vnm_mad/remotes/fw/pre new file mode 100755 index 0000000000..44337c50d2 --- /dev/null +++ b/src/vnm_mad/remotes/fw/pre @@ -0,0 +1,19 @@ +#!/bin/bash + +# -------------------------------------------------------------------------- # +# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # +# # +# Licensed under the Apache License, Version 2.0 (the "License"); you may # +# not use this file except in compliance with the License. You may obtain # +# a copy of the License at # +# # +# http://www.apache.org/licenses/LICENSE-2.0 # +# # +# Unless required by applicable law or agreed to in writing, software # +# distributed under the License is distributed on an "AS IS" BASIS, # +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # +# See the License for the specific language governing permissions and # +# limitations under the License. # +#--------------------------------------------------------------------------- # + +exit 0 \ No newline at end of file