diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-06-29 17:43:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-29 17:43:21 +0000 |
| commit | c6c2fde538db5c30875696ff03b56d541ec428dd (patch) | |
| tree | 1d9fdec77169661ba10ff87f12ae32d86bacacff /resource-assignment/provider/src/test | |
| parent | 153b6c24886820f7f6fa1d160551f292eb4e6948 (diff) | |
| parent | 56e2d29ba30639c56f465a05377cf464d4ac85e4 (diff) | |
Merge "Support for defining multiple ranges in RANGE_RULE"
Diffstat (limited to 'resource-assignment/provider/src/test')
| -rw-r--r-- | resource-assignment/provider/src/test/resources/sql/data.sql | 42 | ||||
| -rw-r--r-- | resource-assignment/provider/src/test/resources/sql/schema.sql | 4 |
2 files changed, 20 insertions, 26 deletions
diff --git a/resource-assignment/provider/src/test/resources/sql/data.sql b/resource-assignment/provider/src/test/resources/sql/data.sql index 681a9c458..236a16d18 100644 --- a/resource-assignment/provider/src/test/resources/sql/data.sql +++ b/resource-assignment/provider/src/test/resources/sql/data.sql @@ -80,19 +80,19 @@ values ( 'The provisioned access bandwidth is at or exceeds 70% of the total server capacity.'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'subinterface-id', 'L3AVPN-EVC', 'VPE-Cust', 'Port', 100, 3999); + 'subinterface-id', 'L3AVPN-EVC', 'VPE-Cust', 'Port', 'true', '100-3999'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-inner', 'L3AVPN-EVC', 'VPE-Cust', 'Port', 2, 4091); + 'vlan-id-inner', 'L3AVPN-EVC', 'VPE-Cust', 'Port', 'true', '2-4091'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'bundle-id', 'L3AVPN-PORT', 'VPE-Cust', 'Port', 1, 99999); + 'bundle-id', 'L3AVPN-PORT', 'VPE-Cust', 'Port', 'true', '1-99999'); INSERT INTO MAX_PORT_SPEED ( image_file_name, end_point_position, interface_name, max_speed, unit) @@ -148,39 +148,33 @@ VALUES ( '1', '200', '200'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'cust-vlan-id', 'ADIG', 'VPE', 'VNF', '2', '1000'); + 'cust-vlan-id', 'ADIG', 'VPE', 'VNF', 'true', '2-1000'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-inner', 'ADIG', 'VPE', 'VNF', '1002', '2000'); + 'vlan-id-inner', 'ADIG', 'VPE', 'VNF', 'true', '1002-2000'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-outer', 'MY-SERV-MODEL', 'VPE-Cust', 'Site', '2', '1000'); + 'vlan-id-outer', 'MY-SERV-MODEL', 'VPE-Cust', 'Site', 'true', '2-1000'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core1', 'Site', '1002', '2000'); + 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core1', 'Site', 'true', '1002-2000'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core2', 'Site', '1002', '2000'); + 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core2', 'Site', 'true', '1002-2000,2200-4000'); INSERT INTO RANGE_RULE ( - range_name, service_model, end_point_position, equipment_level, min_value, - max_value) + range_name, service_model, end_point_position, equipment_level, equipment_expression, ranges) VALUES ( - 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core3', 'Site', '400', '600'); + 'vlan-id-filter', 'MY-SERV-MODEL', 'VPE-Core3', 'Site', 'true', '400-600');
\ No newline at end of file diff --git a/resource-assignment/provider/src/test/resources/sql/schema.sql b/resource-assignment/provider/src/test/resources/sql/schema.sql index 40761de42..ed123ddd6 100644 --- a/resource-assignment/provider/src/test/resources/sql/schema.sql +++ b/resource-assignment/provider/src/test/resources/sql/schema.sql @@ -96,8 +96,8 @@ CREATE TABLE RANGE_RULE ( service_model VARCHAR(50) NOT NULL, end_point_position VARCHAR(50) NOT NULL, equipment_level VARCHAR(50) NOT NULL, - min_value INT NOT NULL, - max_value INT NOT NULL + equipment_expression VARCHAR(2000) NOT NULL, + ranges VARCHAR(100) NOT NULL ); CREATE TABLE MAX_PORT_SPEED ( |