aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller
AgeCommit message (Collapse)AuthorFilesLines
2019-04-01replace all fixed wiremock portsBenjamin, Max (mb388a)5-6/+58
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-28Updated to include all VFModule membersBenjamin, Max (mb388a)2-2318/+2225
- Updated to include all VFModule members when matching against the cvnfc template. ignore failing unit test after restoring existing commits Change-Id: I0fd3e7649fd87257b71e3a9357e26aac666b7dc0 Issue-ID: SO-1709 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-25PNF ingestion in SO catalogdbeeginux18-3010/+4036
Support PNF csar ingestion in SO catalogdb Add integation test for TOSCA installer Fix the VNF resource/resource customization insert https://jira.onap.org/browse/SO-1604 subtask so-1607 and SO-1608 are included The catalogdb table contents are attached in the jira Issue-ID: SO-1604 Change-Id: Ie08c4a1219a6cce96ba081b0dd9d3e5fd997da8f Signed-off-by: eeginux <henry.xie@est.tech>
2019-03-21Corrected hibernate for cfvc customization tableBenjamin, Max (mb388a)3-46/+118
fix two tests that did not ignore some properties fix schema sql file that was missing fields Properly wire hibernate entities, clean up db tables Update schema.sql files to be consistent add junit for customization linked to same cvnfc Change-Id: I4bc0a83cb3908f5b34224416e75446b6cd166b9e Issue-ID: SO-1689 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-18Removed MsoLogger classr.bogacki5-24/+24
Bye bye MsoLogger class. Extracted constants to separated classes. Fixed imports. Change-Id: I7c8e0527e7dbd097d3ea93b9dab279354652da47 Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-14Saved vnfOperationalEnvironmentId to be used laterBenjamin, Max (mb388a)1-0/+1
Removed unnecessary lines in junit test class. Saved vnfOperationalEnvironmentId to the model table to be used for AAI status update call later. Change-Id: I812d21d483d716bb5135c408369a160e4600efc2 Issue-ID: SO-1662 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-13Remove skipping of the Fabric config codeBenjamin, Max (mb388a)2-29/+52
Merged the FabricConfig and TestCvnfc tests together. Remove skipping of the Fabric config code if the Cvnfc already exist. Instead use the existing cvnfc/vfc object. Change-Id: Ica648b98a803a54636e0e451590ec94b51f17949 Issue-ID: SO-1653 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-11Cleaned up MsoLogger classr.bogacki1-2/+0
Removed setServiceName method from MsoLogger. Cleaned up unused methods from MsoLogger. Change-Id: I1fe033ed25dda32c07693a5087bf65de3ecc229c Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-03-08avpn bonding vnr vrf config fk incorrectBenjamin, Max (mb388a)2-61/+178
included additional unit tests for ToscaResourceInstaller class Refactored Tosca installer to assign template of type Change-Id: Iac960045e7fe4355081637cfee0dc3676524a012 Issue-ID: SO-1611 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-03-01removed extra code for vnf resource processingBenjamin, Max (mb388a)1-12/+0
removed extra code for vnf resource processing Issue-ID: SO-1581 Change-Id: Ie8e0da953c20780ba4b63fb7de53e5c7844790cc Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-28Removed MsoLogger from 'asdc-controller'r.bogacki13-287/+297
Replaced MsoLogger with plain slf4j. Refactored login output. Fixed imports. Change-Id: I15f40f26c5373222c903e74436ede3a9521d8bdb Issue-ID: LOG-631 Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>
2019-02-24Prevent race conditions on same distributionId.Benjamin, Max (mb388a)4-19/+38
- Code to include optimistic lock to prevent race conditions on same distributionId. Change-Id: Ibe110b32f2472d991a4a3e03e3d15d5e4deefd65 Issue-ID: SO-1566 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-20Fix for when Customization already existsBenjamin, Max (mb388a)1-1/+11
- When the Customization already exists associate the new NetworkResource with it. Change-Id: Ia4d89a04d020dd2f2ba4a2f2d330bda9bff6da14 Issue-ID: SO-1540 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-20Merge "fix sonar blocker try-with-resources"Steve Smokowski2-39/+66
2019-02-19Update to set correct cvnfc codeBenjamin, Max (mb388a)2-12/+39
- Update testcase naming code to oamfw for testCvnfc. - Update to set correct cvnfc nfc_function and nfc_naming_code Change-Id: I13eca10d4d76a24753eca99e3f6ff96d0cc408f4 Issue-ID: SO-1532 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-19fix sonar blocker try-with-resourcesk.kazak2-39/+66
BpmnInstaller: use try-with-resources in containsWorkflows remove unnecessary type casting to ZipEntry BpmnInstallerTest: add tests for containsWorkflows fix test for installBpmn (was silently failing with file not found) Change-Id: I3122bcd19204bf498fe1a9b10630076e2df9d70b Issue-ID: SO-1516 Signed-off-by: k.kazak <k.kazak@samsung.com>
2019-02-14extract subinterface_network_quantity from policyBenjamin, Max (mb388a)1-10/+39
- Removed duplicate code that was causing a NumberFormatException - Changed name from crTarget to policyNetworkCollection - Added code to check we are setting the quantity on the correct NetworkCollection - Added code to extract the subinterface_network_quantity from the nodeTemplate policy Change-Id: Id12fa0241f16bfd4467209f08af5068d57b2d049 Issue-ID: SO-1510 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-13fix fields not set correctly in Fabric Policy distBenjamin, Max (mb388a)2-45/+56
- Added a null check for vfModuleMemberName. - Added some extra logging to show the VF members and cvnfc template name - Updated to fix fields not set correctly in Fabric Policy distributions. Change-Id: Iaef2114a910ad10ff788b2178953883b0c5269da Issue-ID: SO-1499 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-11Fix for asdc service.Benjamin, Max (mb388a)1-2/+8
Removed exception statements and added assert statements Updated to make sure duplicate config resources aren't getting added to the service. Change-Id: Ic05421711622492e09bc83d8cc126300362ea119 Issue-ID: SO-1496 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-06store raw distribution notification in dbBenjamin, Max (mb388a)7-8/+102
updated the test case to verify ASDC notification sent is the same as one persisted in the DB and verified it updated the test case to verify ASDC notification sent is the same as one persisted in the DB Added unit test case for WatchdogServiceModVerIdLookup changes Updated test resources schema.sql and data.sql to include changes to watchdog_service_mod_ver_id_lookup table Added length to consumer id column with WatchdogServiceModVerIdLookup class ASDC Controller has been enhanced to include the notification message and consumer id as part of existing table watchdog_service_mod_ver_id_lookup. Change-Id: Iee805761ffc16f456d068c44b53804a7febc7933 Issue-ID: SO-1475 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-02-04Merge "make sure the NetworkResourceUUID are correct."Steve Smokowski1-2/+17
2019-02-01make sure the NetworkResourceUUID are correct.Benjamin, Max (mb388a)1-2/+17
- Added test asserts to show that the NetworkResourceUUID was updated correctly. - Added a NetworkResourceCustomization Audit to make sure the NetworkResourceUUID are correct. Change-Id: Id4fbf224aa00d6bd34481bab6a907af12fba56dd Issue-ID: SO-1455 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-31Removed check for ServiceProxyCustomizationBenjamin, Max (mb388a)1-22/+7
- Added test records for the testServiceProxy testcase - Removed check for existing ServiceProxyCustomization since multiple services can associate to the same customization record. Change-Id: Iedf9958759139484a678b29d75291bf143507667 Issue-ID: SO-1454 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-28Merge 'origin/casablanca' into masterBenjamin, Max (mb388a)6-53/+444
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-01-24Upgraded tosca parser to version 1.4.8Benjamin, Max (mb388a)3-4/+4
- Upgraded tosca parser to version 1.4.8 and updated imports Change-Id: Ic9549375d3d70598606056691e4e8baabfbd83d1 Issue-ID: SO-1426 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-22Merge "Fix CSAR distribution on CCVPN service" into casablancaSteve Smokowski1-4/+3
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-22Fix Integer cast exception in getResourceInputso-1408subhash kumar singh2-1/+50
Fix Integer cast exception in getResourceInput. Change-Id: I2022ec07fe12bfe1764f734f1776f6bd32143b84 Issue-ID: SO-1408 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-01-22Either log or rethrow this exception.Shubhada Ramkrishna Vaze1-2/+3
Location:DistributionClientEmulator.java Change-Id: I38b1b3fed9db0d24a6045352127e48b98cce6b63 Issue-ID: SO-1397 Signed-off-by: Shubhada Ramkrishna Vaze <SV00449682@TechMahindra.com>
2019-01-21Update the SDC-Tosca versionseshukm3-5/+5
Issue-ID: SDC-1955 Change-Id: I6de3ac0509755b5b4ce54015c761d8651467347b Signed-off-by: seshukm <seshu.kumar.m@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>
2019-01-12Merge "Re-enable Actuator for Springboot 2.0"Steve Smokowski1-5/+4
2019-01-12Merge "Service Proxy Consolidation"Steve Smokowski3-78/+43
2019-01-11Miscellaneous fixesBenjamin, Max (mb388a)2-57/+15
updated common pom to use aai schema version 1.4.1 removed handle sync error from SDNCHandler bpmn flow added mso-request-id to in mapping of delete vnf flows moved temporary test file to temporary folder Removed obsolete genericVnfNode parameter from updateGenericVnfNode sorted vfmodules by base last for negative action reqs Change-Id: I7a5018d67292cfaac8d923ac3bd9b27ed037be57 Issue-ID: SO-1382 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11Service Proxy ConsolidationBenjamin, Max (mb388a)3-78/+43
- Updated ServiceProxyResourceCustomization to remove the ID column - Removed setConfigurationResourceCustomization from serviceProxyResource since that relationship doesn't exist anymore - Updated ServiceProxy resource to remove the object dependencies between ServiceProxyCustomization and ConfigurationResourceCustomization - Removed the delete statement since this is causing the test to fail because the service table doesn't exist yet - Updated configuration_customization to drop the serviceProxyCustomization FK - Added migration script to consolidate the ServiceProxy and ServiceProxyCustomization into a single table and migrate the data. - Code changes to support consolidating the ServiceProxy and ServiceProxyCustomization table into a single table Change-Id: I1e49cb22c8b667f157dd1c349b5e36fd06236630 Issue-ID: SO-1380 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-11Re-enable Actuator for Springboot 2.0Benjamin, Max (mb388a)1-5/+4
Re-enable Actuator for Springboot 2.0 Change-Id: Icee67885d9bd26d6b6ff8a4fceb9add56926b0a8 Issue-ID: SO-1377 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-01-08Fix json parsing of resource inputsubhash kumar singh2-2/+3
Fix json parsing of resource input by adding escape character. Change-Id: Ic19bd5dae5eea25faaeae2df3eb0bcc29482ea7c Issue-ID: SO-1358 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-12-24update request input and sequence to DBsubhash kumar singh5-7/+289
Update request input and sequence to DB. Resource sequence has been added as new column in service table. Resource input has been added as new column in resp resource. Change-Id: I97c8227636f06692190a843a87178517db038bbd Issue-ID: SO-1248 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2018-12-17Use try-with-resourcesManamohan Satapathy1-3/+8
: Sonar:Blocker BpmnInstaller.java:L163 Change-Id: I20d81f7ef77446e50a4034d755537d1ca0b2d92b Issue-ID: SO-1333 Signed-off-by: Manamohan Satapathy <MS00534989@techmahindra.com>
2018-12-12Merge "asdc process vf resource into db bug fix"Steve Smokowski1-68/+80
2018-12-06Enabled Scheduled JobsSmokowski, Steve (ss835w)1-0/+2
Re-enable scheduled jobs inside of springboot 2.0 Change-Id: I9d405b2d4e6c11194a3a84bb9a213c877035ee5e Issue-ID: SO-1292 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-12-05Replace Hard Coded FunctionSmokowski, Steve (ss835w)1-3/+13
- Replaced the VNFC hardcoded Function with the function value that is set on the node template. Change-Id: Id3b2e3a05c5dc9392509972fdf557ec1fc6c3beb Issue-ID: SO-1279 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-12-05Resolve Security ExploitsSmokowski, Steve (ss835w)3-17/+23
normalize all file paths before using them Change-Id: I67aaa00d7218b95dde96f3679efe92c3c0cd33f9 Issue-ID: SO-1275 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2018-11-27Remove all usage of AlarmLoggerBenjamin, Max (mb388a)1-2/+2
Fix broken UT from removing alarm logger fixed compilation and merge issues Remove all usage of AlarmLogger Change-Id: Ic87abd51423274570bfca0ed976d9642a91a843d Issue-ID: SO-1229 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2018-11-23asdc process vf resource into db bug fixYulian Han1-68/+80
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064410 Issue-ID: SO-1235 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-11-23asdc process vf resource into db bug fixYulian Han1-68/+80
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064410 Issue-ID: SO-1235 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-11-20Not invoking automatic BPMN deploymentRob Daugherty2-0/+34
SO's SDC Controller is not invoking automatic BPMN deployment on Workflow distribution. Submitting this change on behalf of Elena Kuleshov. Change-Id: Ice68f15d505a88099da61c992a20b943dd40d756 Issue-ID: SO-1214 Signed-off-by: Rob Daugherty <rd472p@att.com>
2018-11-13fix installing VL resource bugYulian Han1-32/+41
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064406 Issue-ID: SO-1184 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com> (cherry picked from commit a2e9ad5d9b34d764493951737ab73821b03bba0c)
2018-11-09fix installing VL resource bugYulian Han1-32/+41
Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f064406 Issue-ID: SO-1184 Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>
2018-11-0711/7: merge casablanca to masterRob Daugherty1-31/+5
Commit: dbb53cabbff772880134699eb81dee775d7df8df Subject: Send correct resourceModuleName Issue: SO-1178 Commit: d3759e15184562647ea83b92cf02140fc705cb0d by ss835w Subject: Update Regex Logic to take into account new scale out URI... Issue: SO-117 Commit: 5dadc2c5790c961a74085d3d10b6f5aec6b7ba30 Subject: Fix msb url in homing cloudsite Issue: SO-1180 Commit: 9a9b0fa23afe8d46171fe95f1090de5a7f701d3d Subject: Updated Reference data for AutoScaleOut Issue: SO-1174 Commit: 3178cad6c756140b18eb658277598e3e2d2d3dcf Subject: ConfigurationParameter is empty for scaleout Issue: SO-1083 Commit: 402bf528e9a796f6ce31ad36c16316c2b31acc48 Subject: Added Null check for gtConfigurationParameter Issue: SO-1179 Commit: fb6ab40a64e74876ba1f08c4d3bdb6a040c21b94 Subject: Bug fixes November 5th Issue: SO-1188 Commit: ce37ae979311ed4e55150426d477db262773beb0 Subject: Removed slashes and added catch block Issue: SO-1183 Commit: 16aa0b6cc42c7287fc080c81451e301c0acc14cf Subject: removed retry from rainy day table Issue: SO-1185 Commit: 2073a3b4c20965252c7f3a0c1aea8e4407e876fa Subject: Fixing scaleOut workflow looping issue Issue: SO-1182 Commit: 5ca364a5e975877244ee51796602043a4b078a23 Subject: Make homingBB optinal and fix homing process Issue: SO-1168 Commit: 1c554c3332ccf6be4e576e9159bbb0f901197379 Subject: bug fixing with reading dmaap message Issue: SO-1191 Change-Id: Id747bc05b791787f304316396bc5fcd20d350b6f Issue-ID: SO-1190 Signed-off-by: Rob Daugherty <rd472p@att.com>