[Libguestfs] [PATCH 2/8] Connection: Rename MetadataReader to Connection
Matthew Booth
mbooth at redhat.com
Mon Feb 1 17:23:30 UTC 2010
---
MANIFEST | 6 ++--
lib/Sys/VirtV2V.pm | 2 +-
.../VirtV2V/{MetadataReader.pm => Connection.pm} | 22 ++++++++--------
.../{MetadataReader => Connection}/LibVirt.pm | 26 ++++++++++----------
.../{MetadataReader => Connection}/LibVirtXML.pm | 26 ++++++++++----------
po/POTFILES.in | 6 ++--
po/es.po | 16 ++++++------
po/fr.po | 16 ++++++------
po/it.po | 16 ++++++------
po/pl.po | 16 ++++++------
po/ru.po | 16 ++++++------
po/virt-v2v.pot | 16 ++++++------
po/zh_CN.po | 16 ++++++------
snapshot/v2v-snapshot.pl | 6 ++--
v2v/virt-v2v.pl | 8 +++---
15 files changed, 107 insertions(+), 107 deletions(-)
rename lib/Sys/VirtV2V/{MetadataReader.pm => Connection.pm} (80%)
rename lib/Sys/VirtV2V/{MetadataReader => Connection}/LibVirt.pm (84%)
rename lib/Sys/VirtV2V/{MetadataReader => Connection}/LibVirtXML.pm (85%)
diff --git a/MANIFEST b/MANIFEST
index 8603430..7bfad76 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -8,9 +8,9 @@ lib/Sys/VirtV2V/GuestOS.pm
lib/Sys/VirtV2V/GuestOS/RedHat.pm
lib/Sys/VirtV2V/Converter.pm
lib/Sys/VirtV2V/Converter/Linux.pm
-lib/Sys/VirtV2V/MetadataReader.pm
-lib/Sys/VirtV2V/MetadataReader/LibVirt.pm
-lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm
+lib/Sys/VirtV2V/Connection.pm
+lib/Sys/VirtV2V/Connection/LibVirt.pm
+lib/Sys/VirtV2V/Connection/LibVirtXML.pm
lib/Sys/VirtV2V/UserMessage.pm
MANIFEST This list of files
MANIFEST.SKIP
diff --git a/lib/Sys/VirtV2V.pm b/lib/Sys/VirtV2V.pm
index a8731af..f74f347 100644
--- a/lib/Sys/VirtV2V.pm
+++ b/lib/Sys/VirtV2V.pm
@@ -64,7 +64,7 @@ L<v2v-snapshot(1)>,
L<Sys::VirtV2V::GuestOS(3pm)>,
L<Sys::VirtV2V::HVSource(3pm)>,
L<Sys::VirtV2V::Converter(3pm)>,
-L<Sys::VirtV2V::MetadataReader(3pm)>,
+L<Sys::VirtV2V::Connection(3pm)>,
L<http://libguestfs.org/>
=cut
diff --git a/lib/Sys/VirtV2V/MetadataReader.pm b/lib/Sys/VirtV2V/Connection.pm
similarity index 80%
rename from lib/Sys/VirtV2V/MetadataReader.pm
rename to lib/Sys/VirtV2V/Connection.pm
index 7b5e7d5..31fbdb3 100644
--- a/lib/Sys/VirtV2V/MetadataReader.pm
+++ b/lib/Sys/VirtV2V/Connection.pm
@@ -1,4 +1,4 @@
-# Sys::VirtV2V::MetadataReader
+# Sys::VirtV2V::Connection
# Copyright (C) 2009 Red Hat Inc.
#
# This library is free software; you can redistribute it and/or
@@ -15,13 +15,13 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-package Sys::VirtV2V::MetadataReader;
+package Sys::VirtV2V::Connection;
use strict;
use warnings;
use Module::Pluggable sub_name => 'modules',
- search_path => ['Sys::VirtV2V::MetadataReader'],
+ search_path => ['Sys::VirtV2V::Connection'],
require => 1;
use Carp;
@@ -30,25 +30,25 @@ use Carp;
=head1 NAME
-Sys::VirtV2V::MetadataReader - Read a variety of guest metadata formats
+Sys::VirtV2V::Connection - Read a variety of guest metadata formats
=head1 SYNOPSIS
- use Sys::VirtV2V::MetadataReader;
+ use Sys::VirtV2V::Connection;
- $reader = Sys::VirtV2V::MetadataReader->instantiate("libvirtxml", $uri,
+ $reader = Sys::VirtV2V::Connection->instantiate("libvirtxml", $uri,
$config, @args);
exit 1 unless($mdr->is_configured());
$dom = $reader->get_dom();
=head1 DESCRIPTION
-Sys::VirtV2V::MetadataReader reads the metadata of a, possibly foreign,
+Sys::VirtV2V::Connection reads the metadata of a, possibly foreign,
guest. It provides the DOM representation of an equivalent libvirt XML
representation.
-Sys::VirtV2V::MetadataReader is an interface to various backends, each of
-which implement a consistent API. Sys::VirtV2V::MetadataReader itself only
+Sys::VirtV2V::Connection is an interface to various backends, each of
+which implement a consistent API. Sys::VirtV2V::Connection itself only
implements methods to access backends.
=head1 METHODS
@@ -134,8 +134,8 @@ Please see the file COPYING.LIB for the full license.
=head1 SEE ALSO
-L<Sys::VirtV2V::MetadataReader::LibVirt(3pm)>,
-L<Sys::VirtV2V::MetadataReader::LibVirtXML(3pm)>,
+L<Sys::VirtV2V::Connection::LibVirt(3pm)>,
+L<Sys::VirtV2V::Connection::LibVirtXML(3pm)>,
L<virt-v2v(1)>,
L<v2v-snapshot(1)>,
L<http://libguestfs.org/>.
diff --git a/lib/Sys/VirtV2V/MetadataReader/LibVirt.pm b/lib/Sys/VirtV2V/Connection/LibVirt.pm
similarity index 84%
rename from lib/Sys/VirtV2V/MetadataReader/LibVirt.pm
rename to lib/Sys/VirtV2V/Connection/LibVirt.pm
index e6fcfff..d3aa80d 100644
--- a/lib/Sys/VirtV2V/MetadataReader/LibVirt.pm
+++ b/lib/Sys/VirtV2V/Connection/LibVirt.pm
@@ -1,4 +1,4 @@
-# Sys::VirtV2V::MetadataReader::LibVirt
+# Sys::VirtV2V::Connection::LibVirt
# Copyright (C) 2009 Red Hat Inc.
#
# This library is free software; you can redistribute it and/or
@@ -15,7 +15,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-package Sys::VirtV2V::MetadataReader::LibVirt;
+package Sys::VirtV2V::Connection::LibVirt;
use strict;
use warnings;
@@ -32,25 +32,25 @@ use Locale::TextDomain 'virt-v2v';
=head1 NAME
-Sys::VirtV2V::MetadataReader::LibVirt - Read libvirt metadata from libvirtd
+Sys::VirtV2V::Connection::LibVirt - Read libvirt metadata from libvirtd
=head1 SYNOPSIS
- use Sys::VirtV2V::MetadataReader;
+ use Sys::VirtV2V::Connection;
- $reader = Sys::VirtV2V::MetadataReader->instantiate
+ $reader = Sys::VirtV2V::Connection->instantiate
("libvirt", "xen+ssh://xenserver.example.com/", $config, @args);
$dom = $reader->get_dom();
=head1 DESCRIPTION
-Sys::VirtV2V::MetadataReader::LibVirt is a backend for
-Sys::VirtV2V::MetadataReader which reads a guest's libvirt XML directly from a
+Sys::VirtV2V::Connection::LibVirt is a backend for
+Sys::VirtV2V::Connection which reads a guest's libvirt XML directly from a
libvirt connection.
=head1 METHODS
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for a detailed
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for a detailed
description of its exported methods.
=over
@@ -94,9 +94,9 @@ sub _handle_args
}
}
-=item Sys::VirtV2V::MetadataReader::LibVirtXML->get_name()
+=item Sys::VirtV2V::Connection::LibVirtXML->get_name()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -109,7 +109,7 @@ sub get_name
=item is_configured()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -183,7 +183,7 @@ sub _get_domain
=item get_dom()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -216,7 +216,7 @@ Please see the file COPYING.LIB for the full license.
=head1 SEE ALSO
-L<Sys::VirtV2V::MetadataReader(3)>,
+L<Sys::VirtV2V::Connection(3)>,
L<virt-v2v(1)>,
L<v2v-snapshot(1)>,
L<http://libguestfs.org/>.
diff --git a/lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm b/lib/Sys/VirtV2V/Connection/LibVirtXML.pm
similarity index 85%
rename from lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm
rename to lib/Sys/VirtV2V/Connection/LibVirtXML.pm
index 191210f..c05aa0f 100644
--- a/lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm
+++ b/lib/Sys/VirtV2V/Connection/LibVirtXML.pm
@@ -1,4 +1,4 @@
-# Sys::VirtV2V::MetadataReader::LibVirtXML
+# Sys::VirtV2V::Connection::LibVirtXML
# Copyright (C) 2009 Red Hat Inc.
#
# This library is free software; you can redistribute it and/or
@@ -15,7 +15,7 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-package Sys::VirtV2V::MetadataReader::LibVirtXML;
+package Sys::VirtV2V::Connection::LibVirtXML;
use strict;
use warnings;
@@ -31,25 +31,25 @@ use Locale::TextDomain 'virt-v2v';
=head1 NAME
-Sys::VirtV2V::MetadataReader::LibVirtXML - Read libvirt XML from a file
+Sys::VirtV2V::Connection::LibVirtXML - Read libvirt XML from a file
=head1 SYNOPSIS
- use Sys::VirtV2V::MetadataReader;
+ use Sys::VirtV2V::Connection;
- $reader = Sys::VirtV2V::MetadataReader->instantiate("libvirtxml", undef,
+ $reader = Sys::VirtV2V::Connection->instantiate("libvirtxml", undef,
$config, @args);
$dom = $reader->get_dom();
=head1 DESCRIPTION
-Sys::VirtV2V::MetadataReader::LibVirtXML is a backend for
-Sys::VirtV2V::MetadataReader which reads libvirt XML guest descriptions from a
+Sys::VirtV2V::Connection::LibVirtXML is a backend for
+Sys::VirtV2V::Connection which reads libvirt XML guest descriptions from a
file.
=head1 METHODS
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for a detailed
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for a detailed
description of its exported methods.
=over
@@ -116,9 +116,9 @@ sub _handle_args
}
}
-=item Sys::VirtV2V::MetadataReader::LibVirtXML->get_name()
+=item Sys::VirtV2V::Connection::LibVirtXML->get_name()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -131,7 +131,7 @@ sub get_name
=item is_configured()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -153,7 +153,7 @@ sub is_configured
=item get_dom()
-See BACKEND INTERFACE in L<Sys::VirtV2V::MetadataReader> for details.
+See BACKEND INTERFACE in L<Sys::VirtV2V::Connection> for details.
=cut
@@ -220,7 +220,7 @@ Please see the file COPYING.LIB for the full license.
=head1 SEE ALSO
-L<Sys::VirtV2V::MetadataReader(3)>,
+L<Sys::VirtV2V::Connection(3)>,
L<virt-v2v(1)>,
L<v2v-snapshot(1)>,
L<http://libguestfs.org/>.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40331c8..8fa921c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,8 +4,8 @@
../lib/Sys/VirtV2V/HVSource/Xen/Linux.pm
../lib/Sys/VirtV2V/Converter/Linux.pm
../lib/Sys/VirtV2V/Converter.pm
-../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm
-../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm
-../lib/Sys/VirtV2V/MetadataReader.pm
+../lib/Sys/VirtV2V/Connection/LibVirt.pm
+../lib/Sys/VirtV2V/Connection/LibVirtXML.pm
+../lib/Sys/VirtV2V/Connection.pm
../snapshot/v2v-snapshot.pl
../v2v/virt-v2v.pl
diff --git a/po/es.po b/po/es.po
index 4ca3dcc..2ee7eff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -177,40 +177,40 @@ msgstr "El hipervisor conectado no soporta la caracterÃstica {feature}"
msgid "Unable to find a module to configure this guest"
msgstr "No es posible encontrar un módulo para configurar este huésped"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr "ADVERTENCIA: {modulename} sólo necesita un nombre de archivo."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr "Huésped {name} se debe apagar primero"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr "{name} no es un nombre de huésped válido"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr ""
"ADVERTENCIA: directiva {directive} de configuración desconocida en la "
"sección {name}. "
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr "Debe especificar un nombre de archivo cuando utilice {modulename}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr "Falló al abrir {path}: {error}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr "Imposible analizar sintácticamente a {path}: {error}"
diff --git a/po/fr.po b/po/fr.po
index d95a3c0..ff3c893 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -159,38 +159,38 @@ msgstr ""
msgid "Unable to find a module to configure this guest"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 2324fe3..56f6f92 100644
--- a/po/it.po
+++ b/po/it.po
@@ -174,40 +174,40 @@ msgstr "L'hypervisor connesso non supporta la funzione {feature}"
msgid "Unable to find a module to configure this guest"
msgstr "Impossibile trovare un modulo per la configurazione dell'ospite"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr "ATTENZIONE: {modulename} accetta un solo nome file."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr "{name} non è un nome di ospite valido"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr ""
"ATTENZIONE: direttiva di configurazione {directive} sconosciuta nella "
"sezione {name}."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr "Quando si usa {modulename} è necessario specificare un nome file"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr "Impossibile aprire {path}: {error}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr "Impossibile eseguire il parsing di {path}: {error}"
diff --git a/po/pl.po b/po/pl.po
index 8e06175..6329aba 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -167,39 +167,39 @@ msgstr "Połączony nadzorca nie obsługuje funkcji {feature}"
msgid "Unable to find a module to configure this guest"
msgstr "Nie można odnaleźć modułu do skonfigurowania tego gościa"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr "OSTRZEŻENIE: {modulename} przyjmuje tylko jedną nazwę pliku."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr "Gość {name} musi najpierw zostać wyłączony"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr "{name} nie jest prawidłową nazwą gościa"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr ""
"OSTRZEŻENIE: nieznana dyrektywa konfiguracji {directive} w sekcji {name}."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr "Należy podać nazwę pliku podczas używania {modulename}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr "Otwarcie {path} nie powiodło się: {error}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr "Nie można przetworzyć {path}: {error}"
diff --git a/po/ru.po b/po/ru.po
index 436160a..cd1d5f9 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -167,38 +167,38 @@ msgstr "Подключенный гипервизор не поддержива
msgid "Unable to find a module to configure this guest"
msgstr "Ðе найден модуль Ð´Ð»Ñ Ð½Ð°Ñтройки Ñтого гоÑÑ‚Ñ"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr "Ð’ÐИМÐÐИЕ: {modulename} может принимать только одно Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð³Ð¾ÑÑ‚Ñ: {name}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr "Ð’ÐИМÐÐИЕ: ÐеизвеÑÑ‚Ð½Ð°Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð° наÑтройки {directive} в Ñекции {name}."
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr "Ðеобходимо указать Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° при иÑпользовании {modulename}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr "Ðе удалоÑÑŒ открыть {path}: {error}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr "Ðе удалоÑÑŒ разобрать {path}: {error}"
diff --git a/po/virt-v2v.pot b/po/virt-v2v.pot
index d95a3c0..ff3c893 100644
--- a/po/virt-v2v.pot
+++ b/po/virt-v2v.pot
@@ -159,38 +159,38 @@ msgstr ""
msgid "Unable to find a module to configure this guest"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr ""
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1200971..6af4d70 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -166,38 +166,38 @@ msgstr "连接的管ç†ç¨‹åºä¸æ”¯æŒç‰¹æ€§ {feature}"
msgid "Unable to find a module to configure this guest"
msgstr "æ— æ³•æ‰¾åˆ°é…置这个客户端的模å—"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:85
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:113
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:85
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:113
#, perl-brace-format
msgid "WARNING: {modulename} only takes a single filename."
msgstr "è¦å‘Šï¼š{modulename} åªä½¿ç”¨å•ä¸€æ–‡ä»¶å。"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:125
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:125
#, perl-brace-format
msgid "Guest {name} must be shutdown first"
msgstr "必须首先关é—客户端 {name}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirt.pm:145
+#: ../lib/Sys/VirtV2V/Connection/LibVirt.pm:145
#, perl-brace-format
msgid "{name} isn't a valid guest name"
msgstr "{name} ä¸æ˜¯æœ‰æ•ˆå®¢æˆ·ç«¯å"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:90
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:90
#, perl-brace-format
msgid "WARNING: unknown configuration directive {directive} in {name} section."
msgstr "è¦å‘Šï¼š{name} 部分的未知é…置指令 {directive}。"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:143
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:143
#, perl-brace-format
msgid "You must specify a filename when using {modulename}"
msgstr "使用 {modulename} 时必须指定文件å"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:167
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:167
#, perl-brace-format
msgid "Failed to open {path}: {error}"
msgstr "打开 {path} 失败：{error}"
-#: ../lib/Sys/VirtV2V/MetadataReader/LibVirtXML.pm:180
+#: ../lib/Sys/VirtV2V/Connection/LibVirtXML.pm:180
#, perl-brace-format
msgid "Unable to parse {path}: {error}"
msgstr "æ— æ³•è§£æž {path}：{error}"
diff --git a/snapshot/v2v-snapshot.pl b/snapshot/v2v-snapshot.pl
index 86e4393..ccbc907 100755
--- a/snapshot/v2v-snapshot.pl
+++ b/snapshot/v2v-snapshot.pl
@@ -31,7 +31,7 @@ use Sys::Virt;
use Sys::VirtV2V;
use Sys::VirtV2V::ExecHelper;
-use Sys::VirtV2V::MetadataReader;
+use Sys::VirtV2V::Connection;
use Sys::VirtV2V::UserMessage qw(user_message);
=encoding utf8
@@ -239,8 +239,8 @@ if (!defined($datadir)) {
}
}
-# Get an appropriate MetadataReader
-my $mdr = Sys::VirtV2V::MetadataReader->instantiate($input, {}, $vmm, @ARGV);
+# Get an appropriate Connection
+my $mdr = Sys::VirtV2V::Connection->instantiate($input, {}, $vmm, @ARGV);
if(!defined($mdr)) {
print STDERR user_message(__x("{input} is not a valid input format",
input => $input));
diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl
index ad1610f..82f16ce 100755
--- a/v2v/virt-v2v.pl
+++ b/v2v/virt-v2v.pl
@@ -33,7 +33,7 @@ use Sys::Guestfs::Lib qw(open_guest get_partitions inspect_all_partitions
use Sys::VirtV2V;
use Sys::VirtV2V::GuestOS;
use Sys::VirtV2V::Converter;
-use Sys::VirtV2V::MetadataReader;
+use Sys::VirtV2V::Connection;
use Sys::VirtV2V::UserMessage qw(user_message);
=encoding utf8
@@ -208,8 +208,8 @@ if(defined($config_file)) {
}
}
-# Get an appropriate MetadataReader
-my $mdr = Sys::VirtV2V::MetadataReader->instantiate($input_method, $input_uri,
+# Get an appropriate Connection
+my $mdr = Sys::VirtV2V::Connection->instantiate($input_method, $input_uri,
$config, @ARGV);
if(!defined($mdr)) {
print STDERR user_message __x("{input} is not a valid input method",
@@ -217,7 +217,7 @@ if(!defined($mdr)) {
exit(1);
}
-# Check MetadataReader is properly initialised
+# Check Connection is properly initialised
exit 1 unless($mdr->is_configured());
# Configure GuestOS ([files] and [deps] sections)
--
1.6.6
More information about the Libguestfs
mailing list