diff --git a/src/vnm_mad/remotes/802.1Q/clean b/src/vnm_mad/remotes/802.1Q/clean index 44337c50d2..95c11359c4 100755 --- a/src/vnm_mad/remotes/802.1Q/clean +++ b/src/vnm_mad/remotes/802.1Q/clean @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env ruby # -------------------------------------------------------------------------- # # Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # @@ -16,4 +16,12 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -exit 0 \ No newline at end of file +$: << File.dirname(__FILE__) +$: << File.join(File.dirname(__FILE__), "..") + +require 'OpenNebulaNetwork' +require 'Firewall' + +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.deactivate diff --git a/src/vnm_mad/remotes/802.1Q/post b/src/vnm_mad/remotes/802.1Q/post index 44337c50d2..6458772e86 100755 --- a/src/vnm_mad/remotes/802.1Q/post +++ b/src/vnm_mad/remotes/802.1Q/post @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env ruby # -------------------------------------------------------------------------- # # Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # @@ -16,4 +16,12 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -exit 0 \ No newline at end of file +$: << 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/ebtables/clean b/src/vnm_mad/remotes/ebtables/clean index 0aaefc7e02..ea5644f6a1 100755 --- a/src/vnm_mad/remotes/ebtables/clean +++ b/src/vnm_mad/remotes/ebtables/clean @@ -20,9 +20,12 @@ $: << File.dirname(__FILE__) $: << File.join(File.dirname(__FILE__), "..") require 'Ebtables' +require 'Firewall' -template = ARGV[0] +onevlan = EbtablesVLAN.from_base64(ARGV[0]) -onevlan = EbtablesVLAN.from_base64(template) +onevlan.deactivate -exit onevlan.deactivate +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.deactivate diff --git a/src/vnm_mad/remotes/ebtables/post b/src/vnm_mad/remotes/ebtables/post index c142e41a2f..a862a9aaa9 100755 --- a/src/vnm_mad/remotes/ebtables/post +++ b/src/vnm_mad/remotes/ebtables/post @@ -20,6 +20,12 @@ $: << File.dirname(__FILE__) $: << File.join(File.dirname(__FILE__), "..") require 'Ebtables' +require 'Firewall' onevlan = EbtablesVLAN.from_base64(ARGV[0]) -exit onevlan.activate + +onevlan.activate + +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.activate diff --git a/src/vnm_mad/remotes/ovswitch/clean b/src/vnm_mad/remotes/ovswitch/clean index 44337c50d2..95c11359c4 100755 --- a/src/vnm_mad/remotes/ovswitch/clean +++ b/src/vnm_mad/remotes/ovswitch/clean @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env ruby # -------------------------------------------------------------------------- # # Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # @@ -16,4 +16,12 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -exit 0 \ No newline at end of file +$: << File.dirname(__FILE__) +$: << File.join(File.dirname(__FILE__), "..") + +require 'OpenNebulaNetwork' +require 'Firewall' + +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.deactivate diff --git a/src/vnm_mad/remotes/ovswitch/post b/src/vnm_mad/remotes/ovswitch/post index e59bd2ead6..520d74a455 100755 --- a/src/vnm_mad/remotes/ovswitch/post +++ b/src/vnm_mad/remotes/ovswitch/post @@ -20,6 +20,13 @@ $: << File.dirname(__FILE__) $: << File.join(File.dirname(__FILE__), "..") require 'OpenvSwitch' +require 'Firewall' + onevlan = OpenvSwitchVLAN.from_base64(ARGV[0]) -exit onevlan.activate() + +onevlan.activate + +fw = OpenNebulaFirewall.from_base64(ARGV[0]) + +fw.activate