From 8312f1314be82f82d89941783828b848c128a98e Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Thu, 26 May 2011 23:19:53 -0400
Subject: [PATCH] remove augtools

---
 scripts/vm/network/security_group.py | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py
index 7ba9c937f8d..cd78569d6a9 100755
--- a/scripts/vm/network/security_group.py
+++ b/scripts/vm/network/security_group.py
@@ -18,6 +18,7 @@
 
 import cloud_utils
 from cloud_utils import Command
+from cloudutils.configFileOps import configFileOps
 import logging
 import sys
 import os
@@ -28,7 +29,6 @@ bash = Command("/bin/bash")
 virsh = Command("virsh")
 ebtablessave = Command("ebtables-save")
 ebtables = Command("ebtables")
-augtool = Command("augtool")
 def execute(cmd):
     logging.debug(cmd)
     return bash("-c", cmd).stdout
@@ -545,26 +545,12 @@ def getvmId(vmName):
     
 def addFWFramework(brname):
     try:
-        alreadySetup = augtool.match("/files/etc/sysctl.conf/net.bridge.bridge-nf-call-arptables", "1").stdout.strip()
-        if len(alreadySetup) == 0:
-            script = """
-                        set /files/etc/sysctl.conf/net.bridge.bridge-nf-call-arptables 1
-                        save"""
-            augtool < script
+        cfo = configFileOps("/etc/sysctl.conf")
+        cfo.addEntry("net.bridge.bridge-nf-call-arptables", "1")
+        cfo.addEntry("net.bridge.bridge-nf-call-iptables", "1")
+        cfo.addEntry("net.bridge.bridge-nf-call-ip6tables", "1")
+        cfo.save()
 
-        alreadySetup = augtool.match("/files/etc/sysctl.conf/net.bridge.bridge-nf-call-iptables", "1").stdout.strip()
-        if len(alreadySetup) == 0:
-            script = """
-                        set /files/etc/sysctl.conf/net.bridge.bridge-nf-call-iptables 1
-                        save"""
-            augtool < script
-
-        alreadySetup = augtool.match("/files/etc/sysctl.conf/net.bridge.bridge-nf-call-ip6tables", "1").stdout.strip()
-        if len(alreadySetup) == 0:
-            script = """
-                        set /files/etc/sysctl.conf/net.bridge.bridge-nf-call-ip6tables 1
-                        save"""
-            augtool < script
         execute("sysctl -p /etc/sysctl.conf")
     except:
         logging.debug("failed to turn on bridge netfilter")