From 30ea2bbeb41ea52b7cb90ab647051790d688f35a Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Mon, 4 May 2020 17:21:16 +0200 Subject: [PATCH] B #4646: change info filter to default one (#4647) --- src/flow/lib/models/service_pool.rb | 2 +- src/onedb/local/5.10.0_to_5.12.0.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flow/lib/models/service_pool.rb b/src/flow/lib/models/service_pool.rb index 42cb46e633..b367a73ab2 100644 --- a/src/flow/lib/models/service_pool.rb +++ b/src/flow/lib/models/service_pool.rb @@ -21,7 +21,7 @@ module OpenNebula DOCUMENT_TYPE = 100 - def initialize(client, user_id = -1) + def initialize(client, user_id = -2) super(client, user_id) end diff --git a/src/onedb/local/5.10.0_to_5.12.0.rb b/src/onedb/local/5.10.0_to_5.12.0.rb index c65a0345ca..5901115312 100644 --- a/src/onedb/local/5.10.0_to_5.12.0.rb +++ b/src/onedb/local/5.10.0_to_5.12.0.rb @@ -57,12 +57,12 @@ module Migrator json = JSON.parse(doc.xpath('//BODY').text) - json['networks'] = json['custom_attrs'] + json['networks'] = json['custom_attrs'] || {} json['custom_attrs'] = {} # services if row[:type] == 100 - json['networks_values'] = json['custom_attrs_values'] + json['networks_values'] = json['custom_attrs_values'] || {} json['custom_attrs_values'] = {} # remove unneeded VM information