storage: sheepdog: Split out functions required for tests

Separate the headers so that functions only required for testing of the
sheepdog backend are separated into their own file.
This commit is contained in:
Peter Krempa 2017-01-16 13:41:18 +01:00
parent ebc8564c1a
commit 01d9c3497c
5 changed files with 33 additions and 7 deletions

View File

@ -998,7 +998,8 @@ STORAGE_DRIVER_RBD_SOURCES = \
storage/storage_backend_rbd.h storage/storage_backend_rbd.c
STORAGE_DRIVER_SHEEPDOG_SOURCES = \
storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c
storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c \
storage/storage_backend_sheepdog_priv.h
STORAGE_DRIVER_GLUSTER_SOURCES = \
storage/storage_backend_gluster.h storage/storage_backend_gluster.c

View File

@ -29,6 +29,7 @@
#include "virerror.h"
#include "storage_backend_sheepdog.h"
#include "storage_backend_sheepdog_priv.h"
#include "storage_conf.h"
#include "vircommand.h"
#include "viralloc.h"

View File

@ -29,11 +29,6 @@
# include "storage_backend.h"
int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool,
char *output);
int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol,
char *output);
extern virStorageBackend virStorageBackendSheepdog;
#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */

View File

@ -0,0 +1,29 @@
/*
* storage_backend_sheepdog_priv.h: header for functions necessary in tests
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
*/
#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__
# define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__
# include "conf/storage_conf.h"
int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool,
char *output);
int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol,
char *output);
#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ */

View File

@ -32,7 +32,7 @@
#include "internal.h"
#include "testutils.h"
#include "storage/storage_backend_sheepdog.h"
#include "storage/storage_backend_sheepdog_priv.h"
#include "virstring.h"
#define VIR_FROM_THIS VIR_FROM_NONE