summaryrefslogtreecommitdiffstats
path: root/asdc-controller/src/main/java
AgeCommit message (Collapse)AuthorFilesLines
2019-05-03Merge "Merge remote-tracking branch 'origin/dublin'"Marcus Williams2-78/+185
2019-05-03Merge remote-tracking branch 'origin/dublin'Benjamin, Max (mb388a)2-78/+185
merged dublin into master branch Change-Id: Ifb78d405611b65764fd4f01558b0e703551ed663 Issue-ID: SO-1830 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com> Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-05-03Merge "add resource input Save format when resource is list type e.g. ↵Seshu Kumar M1-28/+54
{key2:vf_prop_list,INDEX,key|default}"
2019-04-30Add Model Version QuerySmokowski, Steven3-3/+16
Fix the sql migration version numbering to be proper Fix marking test as private, mark public Clean up public declarations to private Fix schema.sql to have new column for unit test Revert POM Change, add License, clean up comments Fix bad spelling of method name issue Update catalog db to support new rest endpoint Update local query service and mappers Localstaging of potential catalog db changes Update logic to write overall distro status Change-Id: I84d53b972ede3176c5af32d13444583a36606efa Issue-ID: SO-1820 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-30add resource inputzm3301-28/+54
Save format when resource is list type e.g. {key2:vf_prop_list,INDEX,key|default} Change-Id: I1cde294eb790df0be6df13cfae9959310b93f366 Issue-ID: SO-1393 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-29Removed static fields from ASDCRestInterfaceWitold Ficio Kopel1-14/+11
Fix to Sonar issue - misuse of private static fields within class. Refactored to local variables. Issue-ID: SO-1490 Change-Id: I4e2f3dc5b5424198263bdfc0ff16ae123969db48 Signed-off-by: Witold Ficio Kopel <w.kopel@samsung.com>
2019-04-29Check to make sure Heat records do not exist.Merkel, Jeff1-59/+87
- Replaced index assert statements with stream(). - Updated the UT to retrieve from the service object for the assert statements. - Added check to make sure Heat records don't already exist. Change-Id: Ife02303e7b3f5c7d132fb9c1baebaa3787a18494 Issue-ID: SO-1818 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-27repeat distribution transaction errorParthasarathy, Ramesh2-21/+100
implemented existence of tosca csar first before processing the notification implemented changes to verify if a csar already exists with tosca_csar table before processing the distribution. Updated code to set the SO component status when the csarIsAlreadyDeployed. Change-Id: I777ec603cb2f2f004adaa84e07196a961cebd646 Issue-ID: SO-1808 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-26Reorder modifiers.h003974754-9/+10
Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490 Change-Id: Ic7d2700347b79e0c155f84d3ca1175dda1edb6f8 Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-25Reorder modifiers.h003974753-33/+35
Reorder modifiers to complt with Java code specifications Issue-ID: SO-1490 Change-Id: I5d5e0d0520c5a5c1e90033df3d185ce95a01ca0d Signed-off-by: h00397475 <hena.choudhury@huawei.com>
2019-04-23add vnfcInstanceGroup sequencezm3301-2/+121
Issue-ID: SO-1393 Change-Id: Ife3b71dcfa543a693564779da44800f1dd8486e9 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-20Add existing vnf customization for servicesubhash kumar singh1-1/+15
Add existing vnf customiation for service if they are exit in db. Otherwise vnf_resource_customization_to_service will hold only last process VF while parsing. Change-Id: I52ea9dec58630e61eae88e7c9325aa37d64c00d6 Issue-ID: SO-1805 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-04-19Merge "Add missing lines for CCVPN"Seshu Kumar M1-2/+7
2019-04-19Add missing lines for CCVPNsubhash kumar singh1-3/+7
Add missing lines to create request input in vnfcustomization. Change-Id: If7bced1f5af1ce8a899ef33435582aa420fc6d8b Issue-ID: SO-1800 Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
2019-04-16Add back activity spec installElena Kuleshov1-0/+17
Add back activity spec install Change-Id: Idd7a85b902182424669946b568217483c3c76f79 Issue-ID: SO-1726 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-16Use distribution json for workflow installElena Kuleshov9-19/+333
Use distribution json for workflow install Change-Id: I2eec3700d0ba92794b6ca11bd43683d91fb480ee Issue-ID: SO-1726 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-15Merge "Remove hardcoded literals"Steve Smokowski1-18/+0
2019-04-15Merge "Deploy activities to SDC from Catalog"Steve Smokowski1-8/+77
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)1-44/+56
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-12Remove hardcoded literalsk.kazak1-18/+0
Remove unused hardcoded literals Fix sonar issues with potential hardcoded password literal Change-Id: I4e2cf1f731e8cc2ee9914480d6422e00db276d65 Issue-ID: SO-1788 Signed-off-by: k.kazak <k.kazak@samsung.com>
2019-04-12Deploy activities to SDC from CatalogElena Kuleshov1-8/+77
Deploy activities to SDC from Catalog Change-Id: I1c91b79a060889f14cf0b653b3ed1a60e934c8bf Issue-ID: SO-1725 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-11Fix vFW DistrobutionSmokowski, Steve (ss835w)5-58/+24
Missing check to not reprocess service Issue-ID: SO-1674 Change-Id: I152c61fb726eb8979eb30c8dcb5f4eed05fc4b8b Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
2019-04-10Added isAlreadyDeployed check at the Service level.Benjamin, Max (mb388a)2-11/+48
- Committed changes for tabs verse spaces. - Added isAlreadyDeployed check at the Service level. Change-Id: I1f735830820f84745ed1fb9f5a9e76146ee23d3b Issue-ID: SO-1764 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-09Implement interface to SDC for ActivitySpecElena Kuleshov6-0/+484
Implement interface to SDC for ActivitySpec publishing Change-Id: I4991d312906d7675651b30b08469a4b6cc2e9623 Issue-ID: SO-1740 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-08Replaced all tabs with spaces in java and pom.xmlBenjamin, Max (mb388a)47-6026/+6057
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-03skip post instantiation configurationeeginux1-1/+18
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-02vnf resource uuid nullBenjamin, Max (mb388a)1-10/+15
- Moved VNFC code at the end of the VNF resource handling. Change-Id: I38087a3960d651d9b91e1642c030fda4435d09ca Issue-ID: SO-1732 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-02fix catalogdb cvfnc customizationBenjamin, Max (mb388a)1-155/+169
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-03-28Updated to include all VFModule membersBenjamin, Max (mb388a)1-2318/+2221
- 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 catalogdbeeginux11-2727/+3287
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)2-15/+63
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-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)1-28/+80
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)2-6/+24
- 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 Smokowski1-25/+23
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.kazak1-25/+23
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)5-5/+97
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)4-49/+252
Issue-ID: SO-1435 Change-Id: If065ef5c91e769452fd6701fa6c28a23b4bdf2b2 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>