Hey, It would be nice to have an explanation in the commit log explaining *why* we need that. This might be explained in these bug reports, but we should not expect people to follow these links to understand why we needed to add this. Apart from this, the patch looks good to me. Christophe On Fri, Aug 04, 2017 at 06:53:48PM -0300, Eduardo Lima (Etrunko) wrote: > Related: https://bugzilla.redhat.com/show_bug.cgi?id=1427467 > https://bugzilla.redhat.com/show_bug.cgi?id=1428401 > > Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx> > --- > src/ovirt-foreign-menu.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 141 insertions(+) > > diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c > index 539f716..32c6452 100644 > --- a/src/ovirt-foreign-menu.c > +++ b/src/ovirt-foreign-menu.c > @@ -34,6 +34,9 @@ typedef enum { > STATE_0, > STATE_API, > STATE_VM, > + STATE_HOST, > + STATE_CLUSTER, > + STATE_DATA_CENTER, > STATE_STORAGE_DOMAIN, > STATE_VM_CDROM, > STATE_CDROM_FILE, > @@ -43,6 +46,9 @@ typedef enum { > static void ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, GTask *task, OvirtForeignMenuState state); > static void ovirt_foreign_menu_fetch_api_async(OvirtForeignMenu *menu, GTask *task); > static void ovirt_foreign_menu_fetch_vm_async(OvirtForeignMenu *menu, GTask *task); > +static void ovirt_foreign_menu_fetch_host_async(OvirtForeignMenu *menu, GTask *task); > +static void ovirt_foreign_menu_fetch_cluster_async(OvirtForeignMenu *menu, GTask *task); > +static void ovirt_foreign_menu_fetch_data_center_async(OvirtForeignMenu *menu, GTask *task); > static void ovirt_foreign_menu_fetch_storage_domain_async(OvirtForeignMenu *menu, GTask *task); > static void ovirt_foreign_menu_fetch_vm_cdrom_async(OvirtForeignMenu *menu, GTask *task); > static void ovirt_foreign_menu_refresh_cdrom_file_async(OvirtForeignMenu *menu, GTask *task); > @@ -55,6 +61,9 @@ struct _OvirtForeignMenuPrivate { > OvirtProxy *proxy; > OvirtApi *api; > OvirtVm *vm; > + OvirtHost *host; > + OvirtCluster *cluster; > + OvirtDataCenter *data_center; > char *vm_guid; > > OvirtCollection *files; > @@ -184,6 +193,9 @@ ovirt_foreign_menu_dispose(GObject *obj) > g_clear_object(&self->priv->proxy); > g_clear_object(&self->priv->api); > g_clear_object(&self->priv->vm); > + g_clear_object(&self->priv->host); > + g_clear_object(&self->priv->cluster); > + g_clear_object(&self->priv->data_center); > g_clear_pointer(&self->priv->vm_guid, g_free); > g_clear_object(&self->priv->files); > g_clear_object(&self->priv->cdrom); > @@ -301,6 +313,24 @@ ovirt_foreign_menu_next_async_step(OvirtForeignMenu *menu, > break; > } > /* fall through */ > + case STATE_HOST: > + if (menu->priv->host == NULL) { > + ovirt_foreign_menu_fetch_host_async(menu, task); > + break; > + } > + /* fall through */ > + case STATE_CLUSTER: > + if (menu->priv->cluster == NULL) { > + ovirt_foreign_menu_fetch_cluster_async(menu, task); > + break; > + } > + /* fall through */ > + case STATE_DATA_CENTER: > + if (menu->priv->data_center == NULL) { > + ovirt_foreign_menu_fetch_data_center_async(menu, task); > + break; > + } > + /* fall through */ > case STATE_STORAGE_DOMAIN: > if (menu->priv->files == NULL) { > ovirt_foreign_menu_fetch_storage_domain_async(menu, task); > @@ -650,6 +680,117 @@ static void ovirt_foreign_menu_fetch_storage_domain_async(OvirtForeignMenu *menu > } > > > +static void data_center_fetched_cb(GObject *source_object, > + GAsyncResult *result, > + gpointer user_data) > +{ > + GError *error = NULL; > + GTask *task = G_TASK(user_data); > + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(g_task_get_source_object(task)); > + OvirtResource *resource = OVIRT_RESOURCE(source_object); > + > + ovirt_resource_refresh_finish(resource, result, &error); > + if (error != NULL) { > + g_debug("failed to fetch Data Center: %s", error->message); > + g_task_return_error(task, error); > + g_object_unref(task); > + return; > + } > + > + ovirt_foreign_menu_next_async_step(menu, task, STATE_DATA_CENTER); > +} > + > + > +static void ovirt_foreign_menu_fetch_data_center_async(OvirtForeignMenu *menu, > + GTask *task) > +{ > + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu)); > + g_return_if_fail(OVIRT_IS_PROXY(menu->priv->proxy)); > + g_return_if_fail(OVIRT_IS_CLUSTER(menu->priv->cluster)); > + > + menu->priv->data_center = ovirt_cluster_get_data_center(menu->priv->cluster); > + ovirt_resource_refresh_async(OVIRT_RESOURCE(menu->priv->data_center), > + menu->priv->proxy, > + g_task_get_cancellable(task), > + data_center_fetched_cb, > + task); > +} > + > + > +static void cluster_fetched_cb(GObject *source_object, > + GAsyncResult *result, > + gpointer user_data) > +{ > + GError *error = NULL; > + GTask *task = G_TASK(user_data); > + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(g_task_get_source_object(task)); > + OvirtResource *resource = OVIRT_RESOURCE(source_object); > + > + ovirt_resource_refresh_finish(resource, result, &error); > + if (error != NULL) { > + g_debug("failed to fetch Cluster: %s", error->message); > + g_task_return_error(task, error); > + g_object_unref(task); > + return; > + } > + > + ovirt_foreign_menu_next_async_step(menu, task, STATE_CLUSTER); > +} > + > + > +static void ovirt_foreign_menu_fetch_cluster_async(OvirtForeignMenu *menu, > + GTask *task) > +{ > + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu)); > + g_return_if_fail(OVIRT_IS_PROXY(menu->priv->proxy)); > + g_return_if_fail(OVIRT_IS_HOST(menu->priv->host)); > + > + menu->priv->cluster = ovirt_host_get_cluster(menu->priv->host); > + ovirt_resource_refresh_async(OVIRT_RESOURCE(menu->priv->cluster), > + menu->priv->proxy, > + g_task_get_cancellable(task), > + cluster_fetched_cb, > + task); > +} > + > + > +static void host_fetched_cb(GObject *source_object, > + GAsyncResult *result, > + gpointer user_data) > +{ > + GError *error = NULL; > + GTask *task = G_TASK(user_data); > + OvirtForeignMenu *menu = OVIRT_FOREIGN_MENU(g_task_get_source_object(task)); > + OvirtResource *resource = OVIRT_RESOURCE(source_object); > + > + ovirt_resource_refresh_finish(resource, result, &error); > + if (error != NULL) { > + g_debug("failed to fetch Host: %s", error->message); > + g_task_return_error(task, error); > + g_object_unref(task); > + return; > + } > + > + ovirt_foreign_menu_next_async_step(menu, task, STATE_HOST); > +} > + > + > +static void ovirt_foreign_menu_fetch_host_async(OvirtForeignMenu *menu, > + GTask *task) > +{ > + g_return_if_fail(OVIRT_IS_FOREIGN_MENU(menu)); > + g_return_if_fail(OVIRT_IS_PROXY(menu->priv->proxy)); > + g_return_if_fail(OVIRT_IS_VM(menu->priv->vm)); > + > + menu->priv->host = ovirt_vm_get_host(menu->priv->vm); > + ovirt_resource_refresh_async(OVIRT_RESOURCE(menu->priv->host), > + menu->priv->proxy, > + g_task_get_cancellable(task), > + host_fetched_cb, > + task); > +} > + > + > static void vms_fetched_cb(GObject *source_object, > GAsyncResult *result, > gpointer user_data) > -- > 2.13.4 > > _______________________________________________ > virt-tools-list mailing list > virt-tools-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/virt-tools-list _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
