Re: [libvirt] [test-API 05/14] Move utils/env_parser.py into src

2012-04-19 Thread Guannan Ren 

On 04/19/2012 10:25 AM, Osier Yang wrote:

env_parser.py is to parse env.cfg, which is part of the framework.
---
  repos/domain/install_image.py |2 +-
  repos/domain/install_linux_cdrom.py   |2 +-
  repos/domain/install_linux_check.py   |2 +-
  repos/domain/install_linux_net.py |2 +-
  repos/domain/install_windows_cdrom.py |2 +-
  {utils =  src}/env_parser.py  |0
  src/generator.py  |2 +-
  src/parser.py |2 +-
  8 files changed, 7 insertions(+), 7 deletions(-)
  rename {utils =  src}/env_parser.py (100%)

diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 88b35c1..89b7e40 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -11,8 +11,8 @@ import libvirt
  from libvirt import libvirtError

  from src import sharedmod
+from src import env_parser
  from utils import utils
-from utils import env_parser
  from utils import xmlbuilder

  HOME_PATH = os.getcwd()
diff --git a/repos/domain/install_linux_cdrom.py 
b/repos/domain/install_linux_cdrom.py
index f5af6db..342ed84 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -14,8 +14,8 @@ import libvirt
  from libvirt import libvirtError

  from src import sharedmod
+from src import env_parser
  from utils import utils
-from utils import env_parser
  from utils import xmlbuilder

  required_params = ('guestname', 'guesttype', 'guestos', 'guestarch',)
diff --git a/repos/domain/install_linux_check.py 
b/repos/domain/install_linux_check.py
index 7a5a9ac..f4d04d9 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -12,8 +12,8 @@ import libvirt
  from libvirt import libvirtError

  from src import sharedmod
+from src import env_parser
  from utils import utils
-from utils import env_parser

  required_params = ('guestname', 'guesttype', 'hdmodel', 'nicmodel',)
  optional_params = ('disksize',
diff --git a/repos/domain/install_linux_net.py 
b/repos/domain/install_linux_net.py
index 69f3279..8c8931d 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -14,8 +14,8 @@ import libvirt
  from libvirt import libvirtError

  from src import sharedmod
+from src import env_parser
  from utils import utils
-from utils import env_parser
  from utils import xmlbuilder

  required_params = ('guestname', 'guesttype', 'guestos', 
'guestarch','netmethod',)
diff --git a/repos/domain/install_windows_cdrom.py 
b/repos/domain/install_windows_cdrom.py
index beeb7dd..652e721 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -13,8 +13,8 @@ import libvirt
  from libvirt import libvirtError

  from src import sharedmod
+from src import env_parser
  from utils import utils
-from utils import env_parser
  from utils import xmlbuilder

  VIRSH_QUIET_LIST = virsh --quiet list --all|awk '{print $2}'|grep \^%s$\
diff --git a/utils/env_parser.py b/src/env_parser.py
similarity index 100%
rename from utils/env_parser.py
rename to src/env_parser.py
diff --git a/src/generator.py b/src/generator.py
index 26e1553..1f19ea3 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -25,9 +25,9 @@ import os
  import traceback

  from src import mapper
+from src import env_parser
  from utils import log
  from utils import format
-from utils import env_parser

  # Import of distribution-specific code.  If this is needed somewhere
  # else in the future, please don't copy-paste this, but create some
diff --git a/src/parser.py b/src/parser.py
index f1c2a43..1c4abcb 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -23,8 +23,8 @@ import sys
  import copy
  import string

-from utils import env_parser
  from src import exception
+from src import env_parser

  class CaseFileParser(object):
   Parser the case configuration file to generate a data list.


 ACK

 Guannan Ren

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [test-API 05/14] Move utils/env_parser.py into src

2012-04-18 Thread Osier Yang 
env_parser.py is to parse env.cfg, which is part of the framework.
---
 repos/domain/install_image.py |2 +-
 repos/domain/install_linux_cdrom.py   |2 +-
 repos/domain/install_linux_check.py   |2 +-
 repos/domain/install_linux_net.py |2 +-
 repos/domain/install_windows_cdrom.py |2 +-
 {utils = src}/env_parser.py  |0
 src/generator.py  |2 +-
 src/parser.py |2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename {utils = src}/env_parser.py (100%)

diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
index 88b35c1..89b7e40 100644
--- a/repos/domain/install_image.py
+++ b/repos/domain/install_image.py
@@ -11,8 +11,8 @@ import libvirt
 from libvirt import libvirtError
 
 from src import sharedmod
+from src import env_parser
 from utils import utils
-from utils import env_parser
 from utils import xmlbuilder
 
 HOME_PATH = os.getcwd()
diff --git a/repos/domain/install_linux_cdrom.py 
b/repos/domain/install_linux_cdrom.py
index f5af6db..342ed84 100644
--- a/repos/domain/install_linux_cdrom.py
+++ b/repos/domain/install_linux_cdrom.py
@@ -14,8 +14,8 @@ import libvirt
 from libvirt import libvirtError
 
 from src import sharedmod
+from src import env_parser
 from utils import utils
-from utils import env_parser
 from utils import xmlbuilder
 
 required_params = ('guestname', 'guesttype', 'guestos', 'guestarch',)
diff --git a/repos/domain/install_linux_check.py 
b/repos/domain/install_linux_check.py
index 7a5a9ac..f4d04d9 100644
--- a/repos/domain/install_linux_check.py
+++ b/repos/domain/install_linux_check.py
@@ -12,8 +12,8 @@ import libvirt
 from libvirt import libvirtError
 
 from src import sharedmod
+from src import env_parser
 from utils import utils
-from utils import env_parser
 
 required_params = ('guestname', 'guesttype', 'hdmodel', 'nicmodel',)
 optional_params = ('disksize',
diff --git a/repos/domain/install_linux_net.py 
b/repos/domain/install_linux_net.py
index 69f3279..8c8931d 100644
--- a/repos/domain/install_linux_net.py
+++ b/repos/domain/install_linux_net.py
@@ -14,8 +14,8 @@ import libvirt
 from libvirt import libvirtError
 
 from src import sharedmod
+from src import env_parser
 from utils import utils
-from utils import env_parser
 from utils import xmlbuilder
 
 required_params = ('guestname', 'guesttype', 'guestos', 
'guestarch','netmethod',)
diff --git a/repos/domain/install_windows_cdrom.py 
b/repos/domain/install_windows_cdrom.py
index beeb7dd..652e721 100644
--- a/repos/domain/install_windows_cdrom.py
+++ b/repos/domain/install_windows_cdrom.py
@@ -13,8 +13,8 @@ import libvirt
 from libvirt import libvirtError
 
 from src import sharedmod
+from src import env_parser
 from utils import utils
-from utils import env_parser
 from utils import xmlbuilder
 
 VIRSH_QUIET_LIST = virsh --quiet list --all|awk '{print $2}'|grep \^%s$\
diff --git a/utils/env_parser.py b/src/env_parser.py
similarity index 100%
rename from utils/env_parser.py
rename to src/env_parser.py
diff --git a/src/generator.py b/src/generator.py
index 26e1553..1f19ea3 100644
--- a/src/generator.py
+++ b/src/generator.py
@@ -25,9 +25,9 @@ import os
 import traceback
 
 from src import mapper
+from src import env_parser
 from utils import log
 from utils import format
-from utils import env_parser
 
 # Import of distribution-specific code.  If this is needed somewhere
 # else in the future, please don't copy-paste this, but create some
diff --git a/src/parser.py b/src/parser.py
index f1c2a43..1c4abcb 100644
--- a/src/parser.py
+++ b/src/parser.py
@@ -23,8 +23,8 @@ import sys
 import copy
 import string
 
-from utils import env_parser
 from src import exception
+from src import env_parser
 
 class CaseFileParser(object):
  Parser the case configuration file to generate a data list.
-- 
1.7.7.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list