From f94c995d4d2b5ffd7f7fa7cf6ec10cdcbf4932a7 Mon Sep 17 00:00:00 2001 From: "Threefoot, Jane (jt6620)" Date: Fri, 8 Sep 2017 09:34:19 -0400 Subject: EdgeRules throws descriptive error on invalid rule Also added test coverage, including refactoring of test resources to simplify test suites. Issue-ID: AAI-277 Change-Id: Ibfdc81342a139d121740f10bccc66a7420b61945 Signed-off-by: Threefoot, Jane (jt6620) --- .../bundleconfig-local/etc/oxm/aai_oxm_v10.xml | 2676 ++++----- .../bundleconfig-local/etc/oxm/aai_oxm_v11.xml | 706 ++- .../bundleconfig-local/etc/oxm/aai_oxm_v2.xml | 1726 ++++++ .../bundleconfig-local/etc/oxm/aai_oxm_v8.xml | 3018 +--------- .../bundleconfig-local/etc/oxm/aai_oxm_v9.xml | 916 +-- .../etc/oxm/sideeffect/nested-case.json | 18 + .../etc/queryformarts/graphson/resource.graphson | 2 + .../etc/queryformarts/resource-format.json | 13 + .../etc/queryformarts/resource_and_url-format.json | 16 + .../etc/queryformarts/simple-format.json | 43 + .../etc/relationship/ambiguous-relationship.json | 10 + .../etc/relationship/both-failv10-successv9.json | 8 + .../etc/relationship/both-successv10-failv9.json | 8 + .../etc/relationship/only-related-link.json | 4 + .../etc/relationship/only-relationship-data.json | 7 + .../relationship/too-many-items-relationship.json | 19 + .../top-level-two-keys-relationship.json | 13 + .../relationship/two-top-level-relationship.json | 19 + .../resources/dbedgerules/DbEdgeRules_test.json | 37 + .../dbedgerules/DbEdgeRules_test_broken.json | 35 + .../openecomp/aai/introspection/aai_oxm_v11.xml | 5932 -------------------- .../aai/introspection/sideeffect/nested-case.json | 18 - .../relationship/ambiguous-relationship.json | 10 - .../relationship/both-failv10-successv9.json | 8 - .../relationship/both-successv10-failv9.json | 8 - .../parsers/relationship/only-related-link.json | 4 - .../relationship/only-relationship-data.json | 7 - .../relationship/too-many-items-relationship.json | 19 - .../top-level-two-keys-relationship.json | 13 - .../relationship/two-top-level-relationship.json | 19 - .../queryformats/graphson/resource.graphson | 2 - .../queryformats/resource-format.json | 13 - .../queryformats/resource_and_url-format.json | 16 - .../serialization/queryformats/simple-format.json | 43 - 34 files changed, 4341 insertions(+), 11065 deletions(-) create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json create mode 100644 aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json create mode 100644 aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json create mode 100644 aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json delete mode 100644 aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json (limited to 'aai-core/src/test/resources') diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml index 568b2ad3..2d09ff0f 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml @@ -8,7 +8,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +19,7 @@ ============LICENSE_END========================================================= --> - + @@ -25,381 +27,290 @@ - - - - - - - - + + + + + + + + + + - - - - + + + + + - + + - + + - - - - - - - - - - - - + + + + + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - + + + - - - - - + + - - - - - - - - - - - - - - - + + + + - + + - - + - - + + + - - + + + - - + + + - - - - - - - - - - - - + + + + + - - - - - - + + + - - - - - - - - - - + + + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - + + + - - - - - + + + + + + - + - + + - - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - + @@ -412,61 +323,54 @@ - + + - - - - - - - - - + @@ -476,173 +380,123 @@ + - + + - - - - + + + - - + - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -653,46 +507,43 @@ + - + + - - - - - - + @@ -701,41 +552,40 @@ + - + + - - - - - + + @@ -746,71 +596,65 @@ + - + + - - - - - - + - - + - - - - - + + + @@ -821,98 +665,88 @@ + - + + - - - - - - - - - + - - + - + - - + - - + - - - - - - - - + + + + + + + @@ -921,13 +755,14 @@ + - + @@ -936,88 +771,74 @@ - - - - - - - - - - - - - - - + @@ -1026,58 +847,51 @@ + - - - - - - - - - + @@ -1085,86 +899,76 @@ + - + + - - - - - - - - - + - - - - + - + - - - - - + + + + @@ -1174,58 +978,51 @@ + - - - - - - - - - + @@ -1233,37 +1030,36 @@ + - + + - - - - + @@ -1272,85 +1068,76 @@ + - + + - - - - - - - - - - - - + @@ -1360,85 +1147,76 @@ + - - + + + - - - - - - - - - - - - + @@ -1447,51 +1225,48 @@ - + + - + + - - - + - - - + - - - + + @@ -1500,81 +1275,73 @@ - + + - + + - - - - - - - - - - - - + + @@ -1584,32 +1351,25 @@ + - + + - - - - - - - - - - + + - @@ -1620,37 +1380,36 @@ + - + + - - - - + @@ -1659,37 +1418,36 @@ + - + + - - - - + @@ -1698,271 +1456,152 @@ + - + + - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -1973,81 +1612,73 @@ + - + + - - - - - - - - - - + - - - + + @@ -2057,75 +1688,68 @@ + - + + - - - + - - - - - - - + - - - + + @@ -2134,55 +1758,51 @@ + - + + - - - - - - - + @@ -2192,43 +1812,41 @@ + - + + - - - - - + @@ -2237,37 +1855,36 @@ + - + + - - - - + @@ -2277,38 +1894,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - + + - - @@ -2316,7 +1979,6 @@ - @@ -2324,7 +1986,6 @@ - @@ -2332,23 +1993,20 @@ - - - - - + + @@ -2357,48 +2015,46 @@ + - + + - - - - - - + + @@ -2410,38 +2066,38 @@ + - + + - - - - - - + + + + - - - + + + @@ -2451,28 +2107,28 @@ + - + + - - @@ -2480,7 +2136,6 @@ - @@ -2488,7 +2143,6 @@ - @@ -2496,90 +2150,76 @@ - - - - - - - - - - - - - - - - - + + + @@ -2591,120 +2231,114 @@ + - - - - - + + + + + + - + + - + - - - - - - - + - - + + + - + + - - - - - - + @@ -2713,37 +2347,36 @@ + - + + - - - - + @@ -2752,84 +2385,82 @@ + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + + - - - - - - + - - @@ -2837,7 +2468,6 @@ - @@ -2845,7 +2475,6 @@ - @@ -2853,64 +2482,54 @@ - - - - - - - - - + - - - + @@ -2921,32 +2540,32 @@ + - + + - - - - + + @@ -2956,38 +2575,37 @@ + - + + - - - - - + + @@ -2996,62 +2614,57 @@ + - + + - - - - - - - + - + - - - + + @@ -3060,43 +2673,41 @@ + - + + - - - - - + @@ -3104,53 +2715,60 @@ + - + + - - + + + + + - - - + + + + + - - - + + + @@ -3159,63 +2777,90 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - + - - - - - - - - + + + @@ -3224,43 +2869,41 @@ + - + + - - - - - + @@ -3269,136 +2912,119 @@ + - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -3411,83 +3037,74 @@ + - + + - - - - - - - - - - - - - + + @@ -3497,28 +3114,28 @@ + - + + - - - + @@ -3526,81 +3143,75 @@ + + + - + + - - - - - - - + - - + - - - - + @@ -3609,98 +3220,86 @@ + - + + - - - - - - - + - - - - - - - - @@ -3708,7 +3307,6 @@ - @@ -3716,7 +3314,6 @@ - @@ -3724,70 +3321,60 @@ - - - - - - + - - + - - + - - - - - - - + + + + @@ -3806,7 +3393,7 @@ - + @@ -3815,28 +3402,24 @@ - - - - - + @@ -3850,25 +3433,24 @@ - + + - - - + @@ -3876,89 +3458,79 @@ + - + + - - - - - - - - - + - - - - - + @@ -3968,221 +3540,188 @@ + - + + - - - - - - - - - - - - - - - - - + - - - - - - + - - + - - + - - + - - + - - + - + - - + - - - - - - - - @@ -4190,7 +3729,6 @@ - @@ -4198,7 +3736,6 @@ - @@ -4206,75 +3743,64 @@ - - - - - - - - - + - - + - - + - - - - - - - - + + + + + + + @@ -4285,57 +3811,51 @@ - - + - + + - - - - - + - - @@ -4343,7 +3863,6 @@ - @@ -4351,7 +3870,6 @@ - @@ -4359,46 +3877,39 @@ - - - - - - - - + @@ -4408,31 +3919,32 @@ + + - + + - - - + @@ -4441,104 +3953,92 @@ + - + + - - - - - - - - - - - - - - - - + + @@ -4550,160 +4050,140 @@ + - + + - - - - - - - - - + - - - + - - - - - - - - - - - - - - - + + + - + @@ -4711,70 +4191,64 @@ + - + + - - - - - - - - + - - + @@ -4785,40 +4259,38 @@ + - + + - - + - - + - - - + @@ -4827,149 +4299,129 @@ + - + + - - - - - + - - - - - - - - - - - - - - - + - - - - - - + + @@ -4979,93 +4431,39 @@ + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + @@ -5076,41 +4474,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + @@ -5121,57 +4491,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + @@ -5186,31 +4526,31 @@ - - - - - + + + + - + + @@ -5224,44 +4564,41 @@ - - - - - - - - + + + + - + + @@ -5276,51 +4613,46 @@ - - - - - - - + - - + - + - + + - + + @@ -5335,29 +4667,25 @@ - - - - - - - + + - + - + + @@ -5372,34 +4700,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + - + + @@ -5414,34 +4731,23 @@ - - - - - - - - - - - - - - - - - - + + + + + + - + + @@ -5453,47 +4759,26 @@ - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + + + + - + + @@ -5508,41 +4793,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + @@ -5557,48 +4827,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + + @@ -5613,62 +4860,40 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + - - + + + @@ -5678,64 +4903,58 @@ - - - - - - - - - - + + + - + + @@ -5746,15 +4965,17 @@ + - + + @@ -5764,33 +4985,28 @@ + - - - - - - - - - - + + + - + + @@ -5798,9 +5014,10 @@ - + + @@ -5808,68 +5025,62 @@ - - - - - + - - + + + - + + - - - - - + + - + + - - - - + + @@ -5879,50 +5090,48 @@ + - + + - - - - + - - - + + @@ -5932,31 +5141,32 @@ + + - + + - - - + @@ -5965,34 +5175,33 @@ + - + + - - - @@ -6000,7 +5209,6 @@ - @@ -6008,7 +5216,6 @@ - @@ -6016,42 +5223,37 @@ - - - - - - - - + + + @@ -6061,57 +5263,54 @@ - + + - + + - - - - - - - + + @@ -6121,37 +5320,36 @@ + - + + - - - - + @@ -6160,37 +5358,37 @@ + + - + + - - - - + @@ -6199,13 +5397,13 @@ + - + - @@ -6217,55 +5415,51 @@ + - + + - - - - - - - + @@ -6276,42 +5470,368 @@ - + - + - + - + + + + - - + + - + - - + - + - - + - + - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml index 1c49cf18..3822a54b 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml @@ -30,6 +30,7 @@ + @@ -254,7 +255,7 @@ - + @@ -309,7 +310,7 @@ - + @@ -359,7 +360,7 @@ - + @@ -717,19 +718,32 @@ - + - + + + + + + + + + + + + + + @@ -935,7 +949,7 @@ - + @@ -946,6 +960,12 @@ + + + + + + @@ -1127,7 +1147,7 @@ - + @@ -1135,9 +1155,9 @@ - + - + @@ -1205,9 +1225,9 @@ - + - + @@ -1217,7 +1237,7 @@ - + @@ -1230,7 +1250,7 @@ - + @@ -1240,12 +1260,12 @@ - + - + @@ -1255,7 +1275,7 @@ - + @@ -1651,6 +1671,12 @@ + + + + + + @@ -1685,7 +1711,7 @@ - + @@ -1716,13 +1742,19 @@ + + + + + + - - + + @@ -1863,6 +1895,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1897,14 +1974,25 @@ - + + + + + + + + + + + + @@ -1922,7 +2010,7 @@ - + @@ -2043,14 +2131,25 @@ - + + + + + + + + + + + + @@ -2124,7 +2223,7 @@ - + @@ -2160,7 +2259,7 @@ - + @@ -2194,8 +2293,8 @@ - - + + @@ -2308,6 +2407,11 @@ + + + + @@ -2346,7 +2450,7 @@ - + @@ -2359,14 +2463,25 @@ - + + + + + + + + + + + + @@ -2418,7 +2533,7 @@ - + @@ -2542,7 +2657,7 @@ - + @@ -2651,6 +2766,8 @@ + + @@ -2667,7 +2784,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3151,14 +3302,25 @@ - + + + + + + + + + + + + @@ -3221,7 +3383,7 @@ - + @@ -3562,14 +3724,25 @@ - + + + + + + + + + + + + @@ -3606,22 +3779,22 @@ - + - + - + - + @@ -3632,7 +3805,7 @@ - + @@ -3685,14 +3858,25 @@ - + + + + + + + + + + + + @@ -3729,7 +3913,7 @@ - + @@ -4058,7 +4242,7 @@ - + @@ -4168,7 +4352,7 @@ - + @@ -4198,7 +4382,7 @@ - + @@ -4366,7 +4550,7 @@ - + @@ -4781,7 +4965,7 @@ - + @@ -4791,7 +4975,7 @@ - + @@ -4865,7 +5049,7 @@ - + @@ -4875,7 +5059,7 @@ - + @@ -4896,7 +5080,7 @@ - + @@ -4906,7 +5090,7 @@ - + @@ -4916,7 +5100,7 @@ - + @@ -4947,7 +5131,7 @@ - + @@ -4957,7 +5141,7 @@ - + @@ -4968,7 +5152,7 @@ - + @@ -4991,7 +5175,7 @@ - + @@ -5001,7 +5185,7 @@ - + @@ -5020,14 +5204,25 @@ - + + + + + + + + + + + + @@ -5058,18 +5253,18 @@ - + - + - - + + @@ -5079,7 +5274,7 @@ - + @@ -5115,7 +5310,7 @@ - + @@ -5125,7 +5320,7 @@ - + @@ -5135,7 +5330,7 @@ - + @@ -5159,12 +5354,12 @@ - + - - + + @@ -5174,7 +5369,7 @@ - + @@ -5198,11 +5393,11 @@ - + - + @@ -5220,7 +5415,7 @@ - + @@ -5275,6 +5470,369 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml new file mode 100644 index 00000000..c3b30b45 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v2.xml @@ -0,0 +1,1726 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml index d8f81533..b5a64c87 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml @@ -19,312 +19,51 @@ ============LICENSE_END========================================================= --> - + - + - - + + - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - - - - + + + + + - - + @@ -333,16 +72,16 @@ - + - + - - + + @@ -367,7 +106,7 @@ - + @@ -377,2700 +116,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml index 22c0d4ae..f53bd860 100644 --- a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml @@ -8,7 +8,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +19,7 @@ ============LICENSE_END========================================================= --> - + @@ -25,14 +27,15 @@ - - - - - - - - + + + + + + + + + @@ -42,24 +45,24 @@ - - - - + + + + - + - + @@ -68,8 +71,8 @@ - - + + @@ -87,9 +90,9 @@ - - - + + + @@ -120,7 +123,7 @@ - + @@ -143,16 +146,16 @@ - - + + - - + + @@ -162,8 +165,8 @@ - - + + @@ -174,9 +177,9 @@ - + - + @@ -184,7 +187,7 @@ - + @@ -210,7 +213,7 @@ - + @@ -229,18 +232,18 @@ - - - - - + + + + + - + @@ -252,7 +255,7 @@ - + @@ -295,19 +298,19 @@ - - - - - - - - - - + + + + + + + + + + - + @@ -320,7 +323,7 @@ - + @@ -369,7 +372,7 @@ - + @@ -383,7 +386,7 @@ - + @@ -400,8 +403,8 @@ - - + + @@ -443,7 +446,7 @@ - + @@ -494,8 +497,8 @@ - - + + @@ -510,7 +513,7 @@ - + @@ -542,7 +545,7 @@ - + @@ -558,7 +561,7 @@ - + @@ -583,8 +586,8 @@ - - + + @@ -602,7 +605,7 @@ - + @@ -651,9 +654,9 @@ - - - + + + @@ -671,7 +674,7 @@ - + @@ -728,11 +731,11 @@ - - - - - + + + + + @@ -748,7 +751,7 @@ - + @@ -824,7 +827,7 @@ - + @@ -877,7 +880,7 @@ - + @@ -889,7 +892,7 @@ - + @@ -947,9 +950,9 @@ - - - + + + @@ -1003,7 +1006,7 @@ - + @@ -1018,7 +1021,7 @@ - + @@ -1040,7 +1043,7 @@ - + @@ -1056,7 +1059,7 @@ - + @@ -1118,7 +1121,7 @@ - + @@ -1135,7 +1138,7 @@ - + @@ -1197,7 +1200,7 @@ - + @@ -1215,7 +1218,7 @@ - + @@ -1247,7 +1250,7 @@ - + @@ -1264,7 +1267,7 @@ - + @@ -1321,8 +1324,8 @@ - - + + @@ -1339,7 +1342,7 @@ - + @@ -1368,7 +1371,7 @@ - + @@ -1390,7 +1393,7 @@ - + @@ -1406,7 +1409,7 @@ - + @@ -1428,7 +1431,7 @@ - + @@ -1444,7 +1447,7 @@ - + @@ -1580,9 +1583,9 @@ - - - + + + @@ -1600,7 +1603,7 @@ - + @@ -1652,8 +1655,8 @@ - - + + @@ -1670,7 +1673,7 @@ - + @@ -1717,8 +1720,8 @@ - - + + @@ -1734,7 +1737,7 @@ - + @@ -1771,7 +1774,7 @@ - + @@ -1788,7 +1791,7 @@ - + @@ -1808,6 +1811,7 @@ + @@ -1815,7 +1819,7 @@ - + @@ -1831,7 +1835,7 @@ - + @@ -1853,7 +1857,7 @@ - + @@ -1864,8 +1868,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1873,8 +1919,8 @@ - - + + @@ -1884,7 +1930,7 @@ - + @@ -1932,8 +1978,8 @@ - - + + @@ -1949,7 +1995,7 @@ - + @@ -1980,8 +2026,8 @@ - - + + @@ -2000,7 +2046,7 @@ - + @@ -2022,9 +2068,9 @@ - + - + @@ -2041,7 +2087,7 @@ - + @@ -2119,11 +2165,6 @@ - - - - - @@ -2144,9 +2185,9 @@ - - - + + + @@ -2165,11 +2206,11 @@ - - - - - + + + + + @@ -2179,14 +2220,14 @@ - + - + @@ -2216,12 +2257,12 @@ - + - - + + @@ -2233,7 +2274,7 @@ - + @@ -2265,7 +2306,7 @@ - + @@ -2281,7 +2322,7 @@ - + @@ -2303,7 +2344,7 @@ - + @@ -2319,24 +2360,25 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -2346,7 +2388,7 @@ - + @@ -2375,7 +2417,7 @@ - + @@ -2454,7 +2496,7 @@ - + @@ -2472,7 +2514,7 @@ - + @@ -2489,8 +2531,8 @@ - - + + @@ -2507,7 +2549,7 @@ - + @@ -2529,8 +2571,8 @@ - - + + @@ -2546,7 +2588,7 @@ - + @@ -2580,7 +2622,7 @@ - + @@ -2588,8 +2630,8 @@ - - + + @@ -2605,7 +2647,7 @@ - + @@ -2632,7 +2674,7 @@ - + @@ -2644,7 +2686,7 @@ - + @@ -2694,7 +2736,7 @@ - + @@ -2717,7 +2759,7 @@ - + @@ -2750,9 +2792,9 @@ - - - + + + @@ -2768,7 +2810,7 @@ - + @@ -2795,7 +2837,7 @@ - + @@ -2811,7 +2853,7 @@ - + @@ -2856,6 +2898,7 @@ + @@ -2913,10 +2956,10 @@ - - - - + + + + @@ -2933,7 +2976,7 @@ - + @@ -2995,8 +3038,8 @@ - - + + @@ -3010,7 +3053,7 @@ - + @@ -3027,7 +3070,7 @@ - + @@ -3044,7 +3087,7 @@ - + @@ -3103,7 +3146,7 @@ - + @@ -3116,7 +3159,7 @@ - + @@ -3259,10 +3302,10 @@ - - - - + + + + @@ -3281,7 +3324,7 @@ - + @@ -3307,7 +3350,7 @@ - + @@ -3321,7 +3364,7 @@ - + @@ -3338,7 +3381,7 @@ - + @@ -3350,7 +3393,7 @@ - + @@ -3418,7 +3461,7 @@ - + @@ -3435,7 +3478,7 @@ - + @@ -3483,6 +3526,7 @@ + @@ -3512,7 +3556,7 @@ - + @@ -3537,32 +3581,32 @@ - + - + - + - + - + - + @@ -3644,12 +3688,12 @@ - - - - - - + + + + + + @@ -3669,7 +3713,7 @@ - + @@ -3759,7 +3803,7 @@ - + @@ -3777,7 +3821,7 @@ - + @@ -3794,7 +3838,7 @@ - + @@ -3810,7 +3854,7 @@ - + @@ -3845,6 +3889,7 @@ + @@ -3887,8 +3932,8 @@ - - + + @@ -3907,7 +3952,7 @@ - + @@ -3954,7 +3999,7 @@ - + @@ -4028,12 +4073,12 @@ - - - + + + - + @@ -4048,7 +4093,7 @@ - + @@ -4098,7 +4143,7 @@ - + @@ -4113,7 +4158,7 @@ - + @@ -4140,7 +4185,7 @@ - + @@ -4153,7 +4198,7 @@ - + @@ -4177,7 +4222,7 @@ - + @@ -4202,7 +4247,7 @@ - + @@ -4232,7 +4277,7 @@ - + @@ -4247,7 +4292,7 @@ - + @@ -4270,8 +4315,8 @@ - - + + @@ -4287,7 +4332,7 @@ - + @@ -4312,8 +4357,8 @@ - - + + @@ -4358,7 +4403,7 @@ - + @@ -4388,8 +4433,8 @@ - - + + @@ -4397,7 +4442,7 @@ - + @@ -4436,16 +4481,16 @@ - - - + + + - + @@ -4482,24 +4527,24 @@ - + - + - + - + @@ -4520,7 +4565,7 @@ - + @@ -4532,7 +4577,7 @@ - + @@ -4555,15 +4600,15 @@ - - + + - + @@ -4586,15 +4631,15 @@ - - + + - + @@ -4617,15 +4662,15 @@ - - + + - + @@ -4649,17 +4694,17 @@ - - - - + + + + - + @@ -4685,14 +4730,14 @@ - + - + @@ -4725,9 +4770,9 @@ - - - + + + @@ -4739,8 +4784,8 @@ - - + + @@ -4790,8 +4835,8 @@ - - + + @@ -4801,7 +4846,7 @@ - + @@ -4822,7 +4867,7 @@ - + @@ -4853,7 +4898,7 @@ - + @@ -4864,7 +4909,7 @@ - + @@ -4877,8 +4922,8 @@ - - + + @@ -4888,7 +4933,7 @@ - + @@ -4906,7 +4951,7 @@ - + @@ -4928,7 +4973,7 @@ - + @@ -4947,7 +4992,7 @@ - + @@ -4979,7 +5024,7 @@ - + @@ -4999,7 +5044,7 @@ - + @@ -5016,7 +5061,7 @@ - + @@ -5032,7 +5077,7 @@ - + @@ -5086,8 +5131,8 @@ - - + + @@ -5107,7 +5152,7 @@ - + @@ -5144,7 +5189,7 @@ - + @@ -5163,7 +5208,7 @@ - + @@ -5185,7 +5230,7 @@ - + @@ -5202,7 +5247,7 @@ - + @@ -5224,7 +5269,7 @@ - + @@ -5258,7 +5303,7 @@ - + @@ -5295,7 +5340,7 @@ - + @@ -5306,6 +5351,249 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json new file mode 100644 index 00000000..40a0493a --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/oxm/sideeffect/nested-case.json @@ -0,0 +1,18 @@ +{ + "global-customer-id": "key1", + "subscriber-name": "44IPZu0Ri", + "subscriber-type": "gIgOtou5Np5u", + "service-subscriptions": { + "service-subscription" : [ { + "service-type" : "key2", + "temp-ub-sub-account-id" : "JJYRez", + "service-instances" : { + "service-instance" : [ { + "service-instance-id" : "nested-instance-key", + "model-invariant-id" : "key1", + "model-version-id" : "key2" + }] + } + }] + } + } \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson new file mode 100644 index 00000000..04f48174 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/graphson/resource.graphson @@ -0,0 +1,2 @@ +{"id": 386506928,"label": "vertex","properties": {"aai-last-mod-ts": [{"id": "ob632u-6e46nk-5j45","value": 1488308500413}],"aai-uri": [{"id": "ob6712-6e46nk-5lhh","value": "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922-as988q/cloud-region-id-987654321-9922-as988q/tenants/tenant/tenant-987654321-9999-as988q/vservers/vserver/vserver-987654321-9999-as988q"}],"prov-status": [{"id": "ob651y-6e46nk-1kw5","value": "example-prov-status-val-7367"}],"aai-created-ts": [{"id": "ob62ae-6e46nk-5gqt","value": 1488308500413}],"source-of-truth": [{"id": "ob61w6-6e46nk-5jwl","value": "FitNesse-Test-as988q"}],"vserver-selflink": [{"id": "ob65g6-6e46nk-3xfp","value": "example-vserver-selflink-val-7367"}],"aai-node-type": [{"id": "ob61hy-6e46nk-5f5x","value": "vserver"}],"in-maint": [{"id": "ob65ue-6e46nk-20p1","value": false}],"resource-version": [{"id": "ob62om-6e46nk-23ut","value": "1488308500413"}],"vserver-name": [{"id": "ob649i-6e46nk-3u9x","value": "example-vserver-name-val-7367vserver-987654321-9999-as988q"}],"vserver-id": [{"id": "ob63va-6e46nk-3sp1","value": "vserver-987654321-9999-as988q"}],"last-mod-source-of-truth": [{"id": "ob63h2-6e46nk-5edh","value": "FitNesse-Test-as988q"}],"vserver-name2": [{"id": "ob64nq-6e46nk-3vut","value": "example-vserver-name2-val-7367"}],"is-closed-loop-disabled": [{"id": "ob668m-6e46nk-229x","value": false}]}} +{"id": 2461872,"label": "vertex","properties": {"aai-last-mod-ts": [{"id": "21hqu-1grlc-5j45","value": 1467901600}],"in-maint": [{"id": "21i52-1grlc-20p1","value": false}],"resource-version": [{"id": "21ija-1grlc-23ut","value": "1467901600"}],"vserver-name": [{"id": "21ixi-1grlc-3u9x","value": "PerfTest_VServerFix0027TenantPez002701611467901587187Name"}],"aai-created-ts": [{"id": "21jbq-1grlc-5gqt","value": 1467901600}],"vserver-id": [{"id": "21jpy-1grlc-3sp1","value": "PerfTest_VServerFix0027TenantPez002701611467901587187"}],"last-mod-source-of-truth": [{"id": "21k46-1grlc-5edh","value": "MSO"}],"vserver-name2": [{"id": "21kie-1grlc-3vut","value": "PerfTest_VServerFix0027TenantPez002701611467901587187-VM Name2 optional"}],"source-of-truth": [{"id": "21kwm-1grlc-5jwl","value": "MSO"}],"vserver-selflink": [{"id": "21lau-1grlc-3xfp","value": "http://testvserverLink.com/.html?vserv=VserverLink"}],"is-closed-loop-disabled": [{"id": "21lp2-1grlc-229x","value": false}],"aai-node-type": [{"id": "21m3a-1grlc-5f5x","value": "vserver"}],"aai-uri": [{"id": "21m3a-1grlc-5a5x","value": "/vservers/vserver/test1"}]}} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json new file mode 100644 index 00000000..c7e42556 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource-format.json @@ -0,0 +1,13 @@ +{ + "results": [ + { + "vserver": { + + } + }, + { + "vserver": { + } + } + ] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json new file mode 100644 index 00000000..d90a71bc --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/resource_and_url-format.json @@ -0,0 +1,16 @@ +{ + "results": [ + { + "url" : "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922-as988q/cloud-region-id-987654321-9922-as988q/tenants/tenant/tenant-987654321-9999-as988q/vservers/vserver/vserver-987654321-9999-as988q", + "vserver": { + + } + }, + { + "url" : "/vservers/vserver/test1", + "vserver": { + + } + } + ] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json new file mode 100644 index 00000000..dd342615 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/queryformarts/simple-format.json @@ -0,0 +1,43 @@ +{ + "results" : [{ + "id" : "0", + "node-type" : "generic-vnf", + "url" : "urimissing", + "properties" : { + "vnf-name" : "myVnf" + }, + "related-to" : [{ + "node-type" : "vserver", + "id" : "1", + "url" : "urimissing" + }] + } , { + "id" : "1", + "node-type" : "vserver", + "url" : "urimissing", + "properties" : { + "vserver-name" : "myVserver" + }, + "related-to" : [{ + "node-type" : "generic-vnf", + "id" : "0", + "url" : "urimissing" + },{ + "node-type" : "pserver", + "id" : "2", + "url" : "/pservers/pserver/key1" + }] + },{ + "id" : "2", + "node-type" : "pserver", + "url" : "/pservers/pserver/key1", + "properties" : { + "hostname" : "myPserver" + }, + "related-to" : [{ + "node-type" : "vserver", + "id" : "1", + "url" : "urimissing" + }] + }] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json new file mode 100644 index 00000000..241cc146 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/ambiguous-relationship.json @@ -0,0 +1,10 @@ +{ + "related-to": "test-object", + "relationship-data" : [{ + "relationship-key" : "test-object.vnf-id", + "relationship-value":"key1" + },{ + "relationship-key" : "test-object.vnf-id", + "relationship-value":"key2" + }] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json new file mode 100644 index 00000000..0f0378d9 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-failv10-successv9.json @@ -0,0 +1,8 @@ +{ + "related-to": "test-object", + "related-link": "/aai/v10/network/test-objects/test-objet/key1", + "relationship-data" : [{ + "relationship-key" : "test-object.vnf-id", + "relationship-value":"key2" + }] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json new file mode 100644 index 00000000..490bbd30 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/both-successv10-failv9.json @@ -0,0 +1,8 @@ +{ + "related-to": "test-object", + "related-link": "http://localhost/aai/v10/network/test-objects/test-object/key1", + "relationship-data" : [{ + "relationship-key" : "test-obect.vnf-id", + "relationship-value":"key2" + }] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json new file mode 100644 index 00000000..15e383aa --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-related-link.json @@ -0,0 +1,4 @@ +{ + "related-to": "test-object", + "related-link": "http://localhost/aai/v10/network/test-objects/test-object/key1" +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json new file mode 100644 index 00000000..dc7445e0 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/only-relationship-data.json @@ -0,0 +1,7 @@ +{ + "related-to": "test-object", + "relationship-data" : [{ + "relationship-key" : "test-object.vnf-id", + "relationship-value":"key1" + }] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json new file mode 100644 index 00000000..97765cfb --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/too-many-items-relationship.json @@ -0,0 +1,19 @@ +{ + "related-to": "l-interface", + "relationship-data" : [{ + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value":"key1" + },{ + "relationship-key" : "subnet.subnet-id", + "relationship-value":"key5" + },{ + "relationship-key" : "vlan.vlan-interface", + "relationship-value":"key3" + },{ + "relationship-key" : "l-interface.interface-name", + "relationship-value":"key2" + },{ + "relationship-key" : "l3-interface-ipv4-address-list.l3-interface-ipv4-address", + "relationship-value":"key4" + }] +} diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json new file mode 100644 index 00000000..c6dbf557 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/top-level-two-keys-relationship.json @@ -0,0 +1,13 @@ +{ + "related-to" : "availability-zone", + "relationship-data" : [ { + "relationship-key" : "cloud-region.cloud-owner", + "relationship-value" : "key1" + }, { + "relationship-key" : "cloud-region.cloud-region-id", + "relationship-value" : "key2" + }, { + "relationship-key" : "availability-zone.availability-zone-name", + "relationship-value" : "key3" + } ] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json new file mode 100644 index 00000000..54cac2c8 --- /dev/null +++ b/aai-core/src/test/resources/bundleconfig-local/etc/relationship/two-top-level-relationship.json @@ -0,0 +1,19 @@ +{ + "related-to": "l-interface", + "relationship-data" : [{ + "relationship-key" : "generic-vnf.vnf-id", + "relationship-value":"key1" + },{ + "relationship-key" : "vlan.vlan-interface", + "relationship-value":"key3" + },{ + "relationship-key" : "l-interface.interface-name", + "relationship-value":"key2" + },{ + "relationship-key" : "zone.zone-id", + "relationship-value":"key5" + },{ + "relationship-key" : "l3-interface-ipv4-address-list.l3-interface-ipv4-address", + "relationship-value":"key4" + }] +} diff --git a/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json new file mode 100644 index 00000000..0031d1f0 --- /dev/null +++ b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test.json @@ -0,0 +1,37 @@ +{ + "rules": [ + { + "from": "foo", + "to": "bar", + "label": "eats", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "NONE", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "foo", + "to": "baz", + "label": "isVeryHappyAbout", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "quux", + "to": "foo", + "label": "dancesWith", + "direction": "IN", + "multiplicity": "One2Many", + "contains-other-v": "!${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + } + ] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json new file mode 100644 index 00000000..d4b7f7f3 --- /dev/null +++ b/aai-core/src/test/resources/dbedgerules/DbEdgeRules_test_broken.json @@ -0,0 +1,35 @@ +{ + "rules": [ + { + "from": "foo", + "to": "bar", + "label": "eats", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "NONE", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "foo", + "to": "baz", + "label": "isVeryHappyAbout", + "direction": "OUT", + "multiplicity": "One2Many", + "contains-other-v": "${direction}", + "delete-other-v": "${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE" + }, + { + "from": "quux", + "to": "foo", + "label": "dancesWith", + "direction": "IN", + "multiplicity": "One2Many", + "contains-other-v": "!${direction}", + "delete-other-v": "${direction}", + "prevent-delete": "NONE" + } + ] +} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml b/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml deleted file mode 100644 index a4899974..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml +++ /dev/null @@ -1,5932 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json b/aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json deleted file mode 100644 index 40a0493a..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/introspection/sideeffect/nested-case.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "global-customer-id": "key1", - "subscriber-name": "44IPZu0Ri", - "subscriber-type": "gIgOtou5Np5u", - "service-subscriptions": { - "service-subscription" : [ { - "service-type" : "key2", - "temp-ub-sub-account-id" : "JJYRez", - "service-instances" : { - "service-instance" : [ { - "service-instance-id" : "nested-instance-key", - "model-invariant-id" : "key1", - "model-version-id" : "key2" - }] - } - }] - } - } \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json deleted file mode 100644 index 241cc146..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/ambiguous-relationship.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "related-to": "test-object", - "relationship-data" : [{ - "relationship-key" : "test-object.vnf-id", - "relationship-value":"key1" - },{ - "relationship-key" : "test-object.vnf-id", - "relationship-value":"key2" - }] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json deleted file mode 100644 index 0f0378d9..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-failv10-successv9.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "related-to": "test-object", - "related-link": "/aai/v10/network/test-objects/test-objet/key1", - "relationship-data" : [{ - "relationship-key" : "test-object.vnf-id", - "relationship-value":"key2" - }] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json deleted file mode 100644 index 490bbd30..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/both-successv10-failv9.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "related-to": "test-object", - "related-link": "http://localhost/aai/v10/network/test-objects/test-object/key1", - "relationship-data" : [{ - "relationship-key" : "test-obect.vnf-id", - "relationship-value":"key2" - }] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json deleted file mode 100644 index 15e383aa..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-related-link.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "related-to": "test-object", - "related-link": "http://localhost/aai/v10/network/test-objects/test-object/key1" -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json deleted file mode 100644 index dc7445e0..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/only-relationship-data.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "related-to": "test-object", - "relationship-data" : [{ - "relationship-key" : "test-object.vnf-id", - "relationship-value":"key1" - }] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json deleted file mode 100644 index 97765cfb..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/too-many-items-relationship.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "related-to": "l-interface", - "relationship-data" : [{ - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value":"key1" - },{ - "relationship-key" : "subnet.subnet-id", - "relationship-value":"key5" - },{ - "relationship-key" : "vlan.vlan-interface", - "relationship-value":"key3" - },{ - "relationship-key" : "l-interface.interface-name", - "relationship-value":"key2" - },{ - "relationship-key" : "l3-interface-ipv4-address-list.l3-interface-ipv4-address", - "relationship-value":"key4" - }] -} diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json deleted file mode 100644 index c6dbf557..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/top-level-two-keys-relationship.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "related-to" : "availability-zone", - "relationship-data" : [ { - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "key1" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "key2" - }, { - "relationship-key" : "availability-zone.availability-zone-name", - "relationship-value" : "key3" - } ] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json b/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json deleted file mode 100644 index 54cac2c8..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/parsers/relationship/two-top-level-relationship.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "related-to": "l-interface", - "relationship-data" : [{ - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value":"key1" - },{ - "relationship-key" : "vlan.vlan-interface", - "relationship-value":"key3" - },{ - "relationship-key" : "l-interface.interface-name", - "relationship-value":"key2" - },{ - "relationship-key" : "zone.zone-id", - "relationship-value":"key5" - },{ - "relationship-key" : "l3-interface-ipv4-address-list.l3-interface-ipv4-address", - "relationship-value":"key4" - }] -} diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson deleted file mode 100644 index 04f48174..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/graphson/resource.graphson +++ /dev/null @@ -1,2 +0,0 @@ -{"id": 386506928,"label": "vertex","properties": {"aai-last-mod-ts": [{"id": "ob632u-6e46nk-5j45","value": 1488308500413}],"aai-uri": [{"id": "ob6712-6e46nk-5lhh","value": "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922-as988q/cloud-region-id-987654321-9922-as988q/tenants/tenant/tenant-987654321-9999-as988q/vservers/vserver/vserver-987654321-9999-as988q"}],"prov-status": [{"id": "ob651y-6e46nk-1kw5","value": "example-prov-status-val-7367"}],"aai-created-ts": [{"id": "ob62ae-6e46nk-5gqt","value": 1488308500413}],"source-of-truth": [{"id": "ob61w6-6e46nk-5jwl","value": "FitNesse-Test-as988q"}],"vserver-selflink": [{"id": "ob65g6-6e46nk-3xfp","value": "example-vserver-selflink-val-7367"}],"aai-node-type": [{"id": "ob61hy-6e46nk-5f5x","value": "vserver"}],"in-maint": [{"id": "ob65ue-6e46nk-20p1","value": false}],"resource-version": [{"id": "ob62om-6e46nk-23ut","value": "1488308500413"}],"vserver-name": [{"id": "ob649i-6e46nk-3u9x","value": "example-vserver-name-val-7367vserver-987654321-9999-as988q"}],"vserver-id": [{"id": "ob63va-6e46nk-3sp1","value": "vserver-987654321-9999-as988q"}],"last-mod-source-of-truth": [{"id": "ob63h2-6e46nk-5edh","value": "FitNesse-Test-as988q"}],"vserver-name2": [{"id": "ob64nq-6e46nk-3vut","value": "example-vserver-name2-val-7367"}],"is-closed-loop-disabled": [{"id": "ob668m-6e46nk-229x","value": false}]}} -{"id": 2461872,"label": "vertex","properties": {"aai-last-mod-ts": [{"id": "21hqu-1grlc-5j45","value": 1467901600}],"in-maint": [{"id": "21i52-1grlc-20p1","value": false}],"resource-version": [{"id": "21ija-1grlc-23ut","value": "1467901600"}],"vserver-name": [{"id": "21ixi-1grlc-3u9x","value": "PerfTest_VServerFix0027TenantPez002701611467901587187Name"}],"aai-created-ts": [{"id": "21jbq-1grlc-5gqt","value": 1467901600}],"vserver-id": [{"id": "21jpy-1grlc-3sp1","value": "PerfTest_VServerFix0027TenantPez002701611467901587187"}],"last-mod-source-of-truth": [{"id": "21k46-1grlc-5edh","value": "MSO"}],"vserver-name2": [{"id": "21kie-1grlc-3vut","value": "PerfTest_VServerFix0027TenantPez002701611467901587187-VM Name2 optional"}],"source-of-truth": [{"id": "21kwm-1grlc-5jwl","value": "MSO"}],"vserver-selflink": [{"id": "21lau-1grlc-3xfp","value": "http://testvserverLink.com/.html?vserv=VserverLink"}],"is-closed-loop-disabled": [{"id": "21lp2-1grlc-229x","value": false}],"aai-node-type": [{"id": "21m3a-1grlc-5f5x","value": "vserver"}],"aai-uri": [{"id": "21m3a-1grlc-5a5x","value": "/vservers/vserver/test1"}]}} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json deleted file mode 100644 index c7e42556..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource-format.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "results": [ - { - "vserver": { - - } - }, - { - "vserver": { - } - } - ] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json deleted file mode 100644 index d90a71bc..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/resource_and_url-format.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "results": [ - { - "url" : "/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-987654321-9922-as988q/cloud-region-id-987654321-9922-as988q/tenants/tenant/tenant-987654321-9999-as988q/vservers/vserver/vserver-987654321-9999-as988q", - "vserver": { - - } - }, - { - "url" : "/vservers/vserver/test1", - "vserver": { - - } - } - ] -} \ No newline at end of file diff --git a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json b/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json deleted file mode 100644 index dd342615..00000000 --- a/aai-core/src/test/resources/org/openecomp/aai/serialization/queryformats/simple-format.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "results" : [{ - "id" : "0", - "node-type" : "generic-vnf", - "url" : "urimissing", - "properties" : { - "vnf-name" : "myVnf" - }, - "related-to" : [{ - "node-type" : "vserver", - "id" : "1", - "url" : "urimissing" - }] - } , { - "id" : "1", - "node-type" : "vserver", - "url" : "urimissing", - "properties" : { - "vserver-name" : "myVserver" - }, - "related-to" : [{ - "node-type" : "generic-vnf", - "id" : "0", - "url" : "urimissing" - },{ - "node-type" : "pserver", - "id" : "2", - "url" : "/pservers/pserver/key1" - }] - },{ - "id" : "2", - "node-type" : "pserver", - "url" : "/pservers/pserver/key1", - "properties" : { - "hostname" : "myPserver" - }, - "related-to" : [{ - "node-type" : "vserver", - "id" : "1", - "url" : "urimissing" - }] - }] -} \ No newline at end of file -- cgit 1.2.3-korg