aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters/src/test
AgeCommit message (Collapse)AuthorFilesLines
2019-04-26Enhancement for querysubhash kumar singh1-0/+1
Enhancemenv for query to include group and vnfccustomization. { "serviceResources": { "modelInfo": { "modelName": "NSService", "modelUuid": "0bad8c92-7d22-49f0-b092-b64e6ca564a7", "modelInvariantUuid": "69161960-515b-4bf3-91f1-313b813f5e1d", "modelVersion": "1.0" }, "serviceType": "", "serviceRole": "", "environmentContext": "General_Revenue-Bearing", "resourceOrder": "NF", "workloadContext": "Production", "serviceVnfs": [ { "modelInfo": { "modelName": "", "modelUuid": "123", "modelInvariantUuid": "", "modelVersion": "", "modelCustomizationUuid": "1234", "modelInstanceName": "test" }, "toscaNodeType": "", "nfFunction": "", "nfType": "", "nfRole": "", "nfNamingCode": "", "multiStageDesign": "", "resourceInput": "", "vfModules": [], "groups": [ { "modelInfo": { "modelName": "test", "modelUuid": "11", "modelInvariantUuid": "11", "modelVersion": "2" }, "vnfcs": [ { "modelInfo": { "modelName": "xfs", "modelUuid": "22", "modelInvariantUuid": "2222", "modelVersion": "22222", "modelCustomizationUuid": "2222" } } ] } ] } ], "serviceNetworks": [], "serviceAllottedResources": [] } } Issue-ID: SO-1393 Change-Id: Iee7f79337f73276f857d6d42b5b2416e4e8f4536 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-04-25Merge "Add SO update config file -application.yaml file"Steve Smokowski1-0/+36
2019-04-24add resourceInput in vnfczm3301-0/+1
Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-23add vnfcInstanceGroup sequencezm3301-0/+1
Issue-ID: SO-1393 Change-Id: Ife3b71dcfa543a693564779da44800f1dd8486e9 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-21Fix issue where null variable causes task to notBenjamin, Max (mb388a)1-0/+36
fixed formatting of newly added files Fix issue where null variable causes task to not complete Change-Id: If2361a0834220c2e2738917a2e5bf9b012570929 Issue-ID: SO-1806 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-21Status message for create vf module event auditBenjamin, Max (mb388a)7-3/+178
Added appc to application-test due to new dependency in openstack Updated exception class to inject mock into class for junits. Added error handling support for when create audit fails. Added error handling for when create audit fails and added test Updated test schema file to create table and added field. Updated pom file to relfect typo in change made. Updated locaton of pojos for audit code Updated test schema file to create table and added field. Updated pom file to relfect typo in change made. Comitting files that i forgot to stage from previous commit Updated locaton of pojos for audit code Additional fixes including vnfcname and null check Fixed bug in delete audit failure check and reverted gateway change. Change-Id: I993ce377dd6407960a65b4940d83d8162b24633c Issue-ID: SO-1792 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-18compliant attribute name and getter settersSindhuri.A1-2/+2
compliant attribute name (to match regex) for ContrailSubnet, ContrailSubnetHostRoutes Issue-ID: SO-1490 Change-Id: Ia78adc1356609b44426b5f692e205166bb80d665 Signed-off-by: Sindhuri.A <arcot.sindhuri@huawei.com>
2019-04-15Merge "add junit coverage for HeatBridgeUtils"Steve Smokowski1-0/+31
2019-04-15add junit coverage for HeatBridgeUtilsLukasz Muszkieta1-0/+31
Change-Id: Ibea7e60ac8e8b511e2a6a6ab54b2072e7e8d4008 Issue-ID: SO-414 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2019-04-15Merge "vnr vrf fk issue"Steve Smokowski1-21/+13
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)1-21/+13
Updated flyway migration script to rename object as per review comments. Used Tosca node type for determining VRF and VNF nodes updated code based on review comments for schema.sql Altered ConfigurationCustomizationResource for VRF-VNF to have bidirectional relationship ToscaResourceInstaller ConfigurationResourceCustomization was made bidrectional Change-Id: Ib45151ff7a40edca38d512ae76f8889b1cc4d0c4 Issue-ID: SO-1777 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-12add junit coverage for MsoCloudClientFactoryImplLukasz Muszkieta1-0/+71
Change-Id: I76f8cc114c0267a8bf65772edb2a51cb7059f15e Issue-ID: SO-414 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2019-04-11Update multicloud plugin GET handlingEric Multanen2-2/+37
Supports multicloud API query by workload name or id. Gets workload details e.g. stack outputs, etc. To be used to fill in inputs for vfmodule that has a volume group or base module. Change-Id: If45783e82c2a209d3385be1b689a02a05baf9922 Issue-ID: SO-1445 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-04-10Re-commit some changes which were lostBenjamin, Max (mb388a)1-1/+1
remove unused code Issue-ID: SO-1767 Change-Id: I12b8295ae4a5bc9e9154c8ccd1bb53f70886f929 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-08Replaced all tabs with spaces in java and pom.xmlBenjamin, Max (mb388a)42-4262/+4295
Added in maven plugins to enforce coding style rules Added in eclipse java formatting xml Change-Id: I3727bbf4ce8dc66abfd8ad21b6cfd0890c5d3ff0 Issue-ID: SO-1765 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-08Merge "Workflow Recipe Lookup"Steve Smokowski1-0/+32
2019-04-08Workflow Recipe LookupElena Kuleshov1-0/+32
Workflow Recipe Lookup and related Catalog Beans Change-Id: Ib1c3493106658d139861d2620dfb9cb382115744 Issue-ID: SO-1728 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-08Query param to pull back nested stack informationBenjamin, Max (mb388a)4-2/+663
Add Query param to pull back nested stack information Change-Id: Idf83291107e2ef7e86bb2de914469b0401eda0ac Issue-ID: SO-1760 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-05Allow volume groups in multicloud plugin adapterEric Multanen1-11/+83
Remove multicloud logic that was skipping over volume group and non-base module requests. Change-Id: Ie121fec2ab752b4d974a1757d01317cd6feef30d Issue-ID: SO-1445 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-04-04add openstack audit of delete functionBenjamin, Max (mb388a)1-9/+5
audit feature for disc and creates Change-Id: I95b6e36d15f0a5a0790aa267a9dbf4c468f69b24 Issue-ID: SO-1749 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-03if audit fails write sub interface data to a aiBenjamin, Max (mb388a)16-257/+2123
added logic to write sub interface information from openstack to a&ai when audit fails to find it Change-Id: I24266812dc60eb69bfd90e3e5b34113e9fd8f4f4 Issue-ID: SO-1737 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-03skip post instantiation configurationeeginux1-0/+2
Update the schema to include new column Ingest the property from tosca to DB https://jira.onap.org/browse/SO-1671 Issue-ID: SO-1671 Change-Id: Ic6d8d2cfccaa24ba1f9320e4fc2f4255d532fb08 Signed-off-by: eeginux <henry.xie@est.tech>
2019-04-02fix catalogdb cvfnc customizationBenjamin, Max (mb388a)2-846/+1200
Hibernate entities were all wrong and needed a complete rewrite. The scope kept growing and ended up touching a lot more of the code than originally planned. These changes make the db interactions much easier and more straightforward from java. The flyway script order had to change to make this migration possible. Change-Id: I6ce363a385661300eddb11923ac6a80538edaddc Issue-ID: SO-1710 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-02Construct multicloud infra_workload endpointEric Multanen2-8/+10
Use the cloudOwner and cloudRegion to construct the multicloud endpoint for the multicloud VNF plugin adapter. Use configuration to obtain the MSB IP and port number. Stop using the cloud sites catalog DB since there is only a single endpoint required talking to multicloud. Change-Id: I0e9b45a51b6e36f4782226f851e7d01de7f1b133 Issue-ID: SO-1447 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)16-590/+609
trying to get the tests that can be threaded to pass started to remove fixed port references Change-Id: I7bfe067a8f36c908039700646571681321e9a6f5 Issue-ID: SO-1676 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-28JUnit tests for NetworkAdapterRestr.bogacki2-1/+41
Increased junit tests coverage according to Sonar analyses. Added test for a network rollback. Change-Id: I85622f62246b4bf3cc8d2ad253facaa2823923e7 Issue-ID: SO-1692 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-24heatbridge implementation for openstack-adapterMunir Ahmad2-0/+816
Converted heatbridge to use AAI Client Removed open feign Removed new aai client implementation Removed aai helper classes Removed unnecessary pom.xml imports converted HeatBridgeImpl to rely on AAI transactions added some example unit tests Replaced MsoLogger with slf4j Resolved merge conflicts Change-Id: I933b49fae82c2f0d7a66d9a85b367b29006c73cc Issue-ID: SO-1484 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> Change-Id: I547b35ebdf51f4534de5d51d7d50a90bb9de4c72 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca> Issue-ID: SO-1484
2019-03-21Merge "Adjust audit to use device_id to find nova server"Steve Smokowski8-209/+484
2019-03-20Adjust audit to use device_id to find nova serverBenjamin, Max (mb388a)8-209/+484
Adjust audit to use device_id to find nova server Change-Id: If060b68ba480b0750e66a7fe26a6fa72382dcdd5 Issue-ID: SO-1677 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-19Add cloudOwner to VNF adapter callEric Multanen8-65/+70
The BPMN layer has the CloudRegion which includes the CloudOwner attribute, but this is not passed to the VNF adapter layer. Calls to the Multicloud infrastructure workload need the CloudOwner as well. This patch adds CloudOwner to the VNF adapter API. While the intended usage is primarily for the multicloud adapter, it touches a log of other files - though those do not make use of it at this point. Change-Id: I88028096fbd84fc3fe5d53786c70b3c8806bb711 Issue-ID: SO-1447 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
2019-03-11DB Schema Change for SO Catalogeeginux1-0/+2
Support PNF and VNF with CDS Meta data Add new table for PNF resource/resource customization add support for blueprint name/version https://jira.onap.org/browse/SO-1606 Issue-ID: SO-1606 Change-Id: I6b8a438be1139859d1902197816dbb8cbcfc095f Signed-off-by: eeginux <henry.xie@est.tech>
2019-03-06improvements to audit inventory featureBenjamin, Max (mb388a)4-19/+41
Adjust test data to add tenant mapping Remove unused unit test already renamed Update logic, to pass hostname not pservername remove unused file that has been refactored Add project to ignore, remove class Address issues in comments on pull request Remove logging that is not needed, used UPdate BPMN to use Boolean Value, change timings Adjust BPMN to not hit deadlock scenario put error message in execution before checking rollback - removed extra code for vnf resource processing found in onap environment. Fix improper use of inclusive gateway causing deadlock Fix flakey unit tests from ONAP Remove qualifier on bean, as it breaks callbacks Adjust pom version of external camunda client Fix polling timers to be more reasonable Updated Junit test for delete vf module in onap. Changed auditInventoryNeeded variable to a boolean to prevent bpmn from erroring out in the event this variable is not found on the execution. Update logic to support writing of self link Change-Id: I2f784a0a58a09f303775282c9be6019031668570 Issue-ID: SO-1597 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-01Merge "audit poller is polling too fast"Steve Smokowski1-1/+1
2019-03-01audit poller is polling too fastBenjamin, Max (mb388a)1-1/+1
Fix version incompatibility in external task client Fix the openstack external task to poll slower Change-Id: I376366f4848afd1eb356f43b556b7de20961ba88 Issue-ID: SO-1587 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-01vnf spin up gr api vnf s base module failsBenjamin, Max (mb388a)7-43/+43
map object representations of json back to json strings marshal all objects to json strings before sending all input params converted to Map<String, Object> Updated userParams map from HashMap<String, String> to Map<String, Object> as HashMap<String, String> userParams was causing VNF spin up to fail. Input json in Userparams was not accepted as a valid json format. Updated other files that were affected by this change. Change-Id: I0c00fc00c4c11b54ace4df7be8d5bfc80d41d130 Issue-ID: SO-1582 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-27Fix start upBenjamin, Max (mb388a)1-1/+1
corrected application properties Issue-ID: SO-1558 Change-Id: Ib768d7c72a64a11dbb08eea79c4c9a4f5fb970a6 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-26Merge "changed to jdbcUrl and updated flyway for bpmn"Steve Smokowski1-1/+1
2019-02-26changed to jdbcUrl and updated flyway for bpmnKalkere Ramesh, Sharan (sk720x)1-1/+1
Fix startup of catalog, request, bpmn and openstack Change-Id: I5982857c610ae46aa8690764c4f6ef99240f5088 Issue-ID: SO-1558 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2019-02-26removed the duplicate BpelRestClientBenjamin, Max (mb388a)2-56/+0
removed the qualifier in the unit test that broke removed the test for bpel rest network test removed the duplicate BpelRestClient and added some logging Change-Id: I2c5007537ef51f36f0014e091a61804d6354d7d7 Issue-ID: SO-1570 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-14fix issue where we attempt audit with no serversBenjamin, Max (mb388a)2-0/+36
fix issue where we attempt audit with no servers Change-Id: I47f76121c616bf65a5f8be73910adcc0d7088bdb Issue-ID: SO-1513 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-14Merge "cloud config migration from openstack to catdb"Steve Smokowski2-165/+0
2019-02-13Strip off TenantId from self link urlBenjamin, Max (mb388a)1-15/+18
Strip off TenantId from self link url Change-Id: I58ac9fe693059eb8cb93d85fb88604cb9c0a0db2 Issue-ID: SO-1502 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-08Remove resources that are not neutron networksBenjamin, Max (mb388a)1-1/+23
Remove resources that are not neutron networks Change-Id: Ie136895f95273e53f86201fe3b58a12fa27c8fe6 Issue-ID: SO-1486 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-04cloud config migration from openstack to catdbBenjamin, Max (mb388a)2-165/+0
remove the wait and sleep code in migration move cloud config migration from openstack to catdb Change-Id: Id887a37ce12665e5d8a604308ea251744529491c Issue-ID: SO-1461 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-04Clean up Unit tests for auditBenjamin, Max (mb388a)16-344/+342
Fix file names to adjust for case sensitivity Clean up Unit tests for audit Change-Id: I839b8a55d47c545cfd54c4c81eecda098b847fce Issue-ID: SO-1462 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-01compare resources from openstack to aaiBenjamin, Max (mb388a)15-1/+1496
Address Review comments on pull request Update Unit test to have proper variable for testing update logic inside bpmn to reflect proper variable Update unit test to check property for audit Add flag to turn on and off audit behavior Add license headers, remove un-used files Update Building Block Tests and Activity Names Fix additional unit tests in so-bpmn-tasks layer Fix broken Junit Test, and correct Bug in if statement Add annotation to ignore class under test profile Additional bug fixes and unit tests for classes Add Additional JUNITS, add more sample data Add Openstack Audit functionality to Adapter Change-Id: I0492063271e991eefc608b56336a5cdf1d5a7778 Issue-ID: SO-1456 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)2-6/+9
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-24bugfixes jan 24thBenjamin, Max (mb388a)4-7/+118
Fix null pointer exception when no requestParameters are specified Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - Use raw slf4j logger - use {} formatting Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - Use raw slf4j logger Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate - removed unused references in test class Add configurable timer in ActivateVfModuleBB to delay call to SDNC activate Update PortGroup objects separately from the parent VCE object - restore setVariable calls back into vce object - they might be needed later. Update PortGroup objects separately from the parent VCE object - updated test class extra call to get PortGroups Update PortGroup objects separately from the parent VCE object - use PortGroup.getInterfaceRole() getter method instead of accessing field directly. Update PortGroup objects separately from the parent VCE object Added back required headers for tenant isolation. removed workflow exception from outmapping in execute Fix possible null ptr exception, fix to add braces. Default networkTechnology in Update as done in Create Fix failing junits, mapper force upper case nwtech update exception builder to properly throw exception error message supporting assign service instance a la carte as well adding in proper exception handling in network rest v1 add the unassign action to R macro data file Change-Id: Ide420514f81b8083b4c76c762c064de199624cf7 Issue-ID: SO-1424 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-22Fix CSAR distribution on CCVPN servicesubhash kumar singh1-4/+3
Fix db schema to allow CCVPN service witout heat artifacts. Change-Id: I4f79881a6a04f01f8984835eea88907a61c640db Issue-ID: SO-1407 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-17Change size for resource inputsubhash kumar singh1-3/+3
Change size for resource input. Change-Id: Ic6856e6baa2623867d0ae688c98ed24dbb245036 Issue-ID: SO-1400 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>