From: Aline Manera <alinefm(a)br.ibm.com>
I am sending the first patch set to refactor model
It is not completed. I still need to do a lot of tests and so on.
But I would like to share it with you to get your suggestion.
Basically, the common code between model and mockmodel was placed into
model/<resource>.py and the specific code into model/libvirtbackend.py
and mockbackend.py
*** It still needs a lot of work ***
- Tests all functions
- Update Makefile and spec files
- Update test cases
Aline Manera (13):
refactor model: Create a separated model for task resource
refactor model: Create a separated model for debugreport resource
refactor model: Create a separated model for config resource
refactor model: Create a separated model for host resource
refactor model: Create a separated model for plugin resource
refactor model: Create a separated model for libvirt connection
refactor model: Move StoragePooldef from model to
libvirtstoragepools.py
refactor model: Create a separated model for storagepool resource
refactor model: Create a separated model for storagevolume resource
refactor model: Create a separated model for interface and network
resources
refactor model: Create a separated model for template resource
refactor model: Create a separated model for vm resource
refactor model: Update server.py and root.py to use new models
src/kimchi/control/base.py | 32 +-
src/kimchi/control/config.py | 30 +-
src/kimchi/control/debugreports.py | 18 +-
src/kimchi/control/host.py | 24 +-
src/kimchi/control/interfaces.py | 11 +-
src/kimchi/control/networks.py | 11 +-
src/kimchi/control/plugins.py | 13 +-
src/kimchi/control/storagepools.py | 32 +-
src/kimchi/control/storagevolumes.py | 24 +-
src/kimchi/control/tasks.py | 11 +-
src/kimchi/control/templates.py | 11 +-
src/kimchi/control/utils.py | 2 +-
src/kimchi/control/vms.py | 17 +-
src/kimchi/mockmodel.py | 784 --------------
src/kimchi/model.py | 1827 --------------------------------
src/kimchi/model/__init__.py | 21 +
src/kimchi/model/config.py | 52 +
src/kimchi/model/debugreports.py | 86 ++
src/kimchi/model/host.py | 49 +
src/kimchi/model/interfaces.py | 48 +
src/kimchi/model/libvirtbackend.py | 955 +++++++++++++++++
src/kimchi/model/libvirtconnection.py | 123 +++
src/kimchi/model/libvirtstoragepool.py | 225 ++++
src/kimchi/model/mockbackend.py | 338 ++++++
src/kimchi/model/networks.py | 115 ++
src/kimchi/model/plugins.py | 29 +
src/kimchi/model/storagepools.py | 86 ++
src/kimchi/model/storagevolumes.py | 95 ++
src/kimchi/model/tasks.py | 45 +
src/kimchi/model/templates.py | 89 ++
src/kimchi/model/vms.py | 164 +++
src/kimchi/networkxml.py | 6 +-
src/kimchi/root.py | 24 +-
src/kimchi/server.py | 16 +-
src/kimchi/vmtemplate.py | 18 +-
35 files changed, 2674 insertions(+), 2757 deletions(-)
delete mode 100644 src/kimchi/mockmodel.py
delete mode 100644 src/kimchi/model.py
create mode 100644 src/kimchi/model/__init__.py
create mode 100644 src/kimchi/model/config.py
create mode 100644 src/kimchi/model/debugreports.py
create mode 100644 src/kimchi/model/host.py
create mode 100644 src/kimchi/model/interfaces.py
create mode 100644 src/kimchi/model/libvirtbackend.py
create mode 100644 src/kimchi/model/libvirtconnection.py
create mode 100644 src/kimchi/model/libvirtstoragepool.py
create mode 100644 src/kimchi/model/mockbackend.py
create mode 100644 src/kimchi/model/networks.py
create mode 100644 src/kimchi/model/plugins.py
create mode 100644 src/kimchi/model/storagepools.py
create mode 100644 src/kimchi/model/storagevolumes.py
create mode 100644 src/kimchi/model/tasks.py
create mode 100644 src/kimchi/model/templates.py
create mode 100644 src/kimchi/model/vms.py
--
1.7.10.4