aboutsummaryrefslogtreecommitdiffstats
path: root/asdc-controller
AgeCommit message (Collapse)AuthorFilesLines
2019-05-23Renamed NF fields in catalog db pojoMerkel, Jeff1-6/+6
- Renamed Nf properties to just Function, Role, Type. Change-Id: I0cec751e783c1fb7abdcf9f9565eadf89e0ac32c Issue-ID: SO-1914 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-05-10Merge "use logger to log exception"Steve Smokowski1-1/+2
2019-05-09Update License infoseshukm1-0/+0
Issue-ID: SO-1854 Change-Id: Icd347db4fddb50a8543193394c71e61d9bd69282 Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
2019-05-09use logger to log exceptionArindam Mondal1-1/+2
sonar link:https://sonar.onap.org/project/issues?id=org.onap.so%3Aso&resolved=false&types=VULNERABILITY Issue-ID: SO-1859 Change-Id: I599ca396db3d24cbef56bb3aea8f83b2d52ff26d Signed-off-by: arindamm <arind.mondal@samsung.com>
2019-05-07Update the format of resourceInputzm3302-9/+14
Save format when resource is list type e.g. {key2:[vf_prop_list,INDEX,key]|default} Issue-ID: SO-1393 Change-Id: Ibb5e7bb31114fa3bbd7a3e1af5f2152a98941a4b Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-05-03Merge "Merge remote-tracking branch 'origin/dublin'"Marcus Williams3-79/+222
2019-05-03Merge remote-tracking branch 'origin/dublin'Benjamin, Max (mb388a)3-79/+222
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 M2-32/+72
{key2:vf_prop_list,INDEX,key|default}"
2019-04-30Add Model Version QuerySmokowski, Steven4-3/+17
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 inputzm3302-32/+72
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, Ramesh3-22/+137
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-27Merge "Reorder modifiers. Reorder modifiers to complt with Java code ↵Seshu Kumar M4-9/+10
specifications Issue-ID: SO-1490"
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-26Merge "Enhancement for query"Seshu Kumar M1-0/+1
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 "Reorder modifiers. Reorder modifiers to complt with Java code ↵Seshu Kumar M3-33/+35
specifications Issue-ID: SO-1490"
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-24add resourceInput in vnfczm3301-0/+1
Issue-ID: SO-1393 Change-Id: I643f49df545bef92f0f0e931f7b7ce1a5dbc21c0 Signed-off-by: zm330 <zhangminyj@chinamobile.com>
2019-04-23add vnfcInstanceGroup sequencezm3302-2/+122
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 Kuleshov20-23/+694
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 Smokowski7-17/+790
2019-04-12vnr vrf fk issueBenjamin, Max (mb388a)3-81/+109
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 Kuleshov7-17/+790
Deploy activities to SDC from Catalog Change-Id: I1c91b79a060889f14cf0b653b3ed1a60e934c8bf Issue-ID: SO-1725 Signed-off-by: Kuleshov, Elena <evn@att.com>
2019-04-11Merge "Fix vFW Distrobution"Byung-Woo Jun12-60/+864
2019-04-11Fix vFW DistrobutionSmokowski, Steve (ss835w)12-60/+864
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-11corrected inlucde filter for formatterBenjamin, Max (mb388a)1-2/+1
all pom.xml files now have two spaces validation is on for pom.xml files Change-Id: I424ea2e4d6a549f468792e5f90a43f3a97e6c954 Issue-ID: SO-1781 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
2019-04-10Added isAlreadyDeployed check at the Service level.Benjamin, Max (mb388a)3-14/+51
- 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 Kuleshov11-0/+671
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)86-7897/+7870
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-04PNF WF post instantiation configurationeeginux2-1/+32
Add PNF ipv4/v6 address for config Deploy Add Integration test for CreateVcpeResCustService_simplified.bpmn Modify the PnfEventReadyDmaapClient to avoid one more running thread Refactor the so-bpmn-infrastructure-flows test resources Modify the CreateVcpeResCustService_simplified.bpmn Add ConfigurePnfResource.bpmn Add Delegates Issue-ID: SO-1506 Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95 Signed-off-by: eeginux <henry.xie@est.tech>
2019-04-03skip post instantiation configurationeeginux2-1/+20
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)3-990/+1334
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-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>