From 2521d40207b8ee654c4f500d7f433e7d6a466243 Mon Sep 17 00:00:00 2001 From: vryzhenkin Date: Wed, 29 Apr 2015 03:34:52 +0300 Subject: [PATCH] Fixed rules for Congress integration tests The root cause of the problem is incorrect rules which created for Congress component in setUpClass function. Rules stored in file rules_murano_system.txt This patch adds additional rule to get environment id (Using old rules for Murano) Change-Id: I4e43a46f897fba271c06ee030ffc8f8f373d092a Closes-Bug: #1449802 --- murano/tests/functional/engine/rules_murano_system.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/murano/tests/functional/engine/rules_murano_system.txt b/murano/tests/functional/engine/rules_murano_system.txt index 728754da1..b1b8b176e 100644 --- a/murano/tests/functional/engine/rules_murano_system.txt +++ b/murano/tests/functional/engine/rules_murano_system.txt @@ -1,4 +1,5 @@ missing_key("") invalid_flavor_name("really.bad.flavor") -predeploy_errors(eid, obj_id, msg) :- murano:objects(obj_id, eid, type), murano:properties(obj_id, "flavor", flavor_name), invalid_flavor_name(flavor_name), murano:properties(obj_id, "name", obj_name), concat(obj_name, ": bad flavor", msg) -predeploy_errors(eid, obj_id, msg) :- murano:objects(obj_id, eid, type), murano:properties(obj_id, "keyname", key_name), missing_key(key_name), murano:properties(obj_id, "name", obj_name), concat(obj_name, ": missing key", msg) \ No newline at end of file +predeploy_errors(eid, obj_id, msg):-murano:objects(obj_id, pid, type), murano_env_of_object(obj_id, eid), murano:properties(obj_id, "flavor", flavor_name), invalid_flavor_name(flavor_name), murano:properties(obj_id, "name", obj_name), concat(obj_name, ": bad flavor", msg) +predeploy_errors(eid, obj_id, msg):-murano:objects(obj_id, pid, type), murano_env_of_object(obj_id, eid), murano:properties(obj_id, "keyname", key_name), missing_key(key_name), murano:properties(obj_id, "name", obj_name), concat(obj_name, ": missing key", msg) +murano_env_of_object(oid,eid):-murano:connected(eid,oid), murano:objects(eid,tid,"io.murano.Environment")