summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-07-26set the ENV in shell instead of DockerfileLiZi2-6/+13
the dpkg command did not work in Dockerfile. So move it to docker-entrypoint.sh Issue-ID: AAI-1423 Change-Id: Ib4d289faa2847b3c27935643dae299a76fbf8bab Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-07-25Merge "Upversion the esr server to 1.2.0"Li Zi3-4/+4
2018-07-25Merge "Update architecture diagram"Li Zi1-0/+0
2018-07-18Upversion the esr server to 1.2.0Kajur, Harish (vk250x)3-4/+4
Issue-ID: AAI-1390 Change-Id: I02ab1fd4f3bebc6a3fab52b93652d07c7548bc87 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
2018-06-29Merge "Dynamically determine image architecture"Li Zi1-3/+3
2018-06-29Merge "Pin jnr-unixsocket for Docker plugin to 0.13"Li Zi1-0/+7
2018-06-06Update architecture diagramJimmy Forsyth1-0/+0
Issue-ID: AAI-1121 Change-Id: I4ce86181a503ab78eca7ed4d4e35004a44423755 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2018-04-24Fix the docker tag.v1.1.02.0.0-ONAP2.0.0-ONAPLiZi1-1/+1
Change-Id: Ibea68ba95a84dc491b0e3ee8d8e21b26cab1d5de Issue-ID: AAI-1095 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-04-24Security: dropwizard in esr-serverLiZi1-1/+1
Change-Id: Id6ededdda5439ce2400fce445f9e9b0df1f2eac9 Issue-ID: AAI-977 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-04-21Fix HTTP protocol used over HTTPS portDenes Nemeth1-1/+1
Change-Id: I24ebeb65e2cd1d0177dbd7f826d0275ce235dea7 Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com> Issue-ID: MSB-195
2018-04-16Dynamically determine image architectureMohammed Naser1-3/+3
The image architecture is currently hardcoded, this patch removes that hardcoded value to allow for ARM64 builds to go through. Change-Id: I5ba78af8853620f03697c3a59b1288b9c25fbb49 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-04-16Pin jnr-unixsocket for Docker plugin to 0.13Mohammed Naser1-0/+7
The current verison of jnr-unixsocket is 0.12 from the Docker plugin however in order to be able the images for ARM64, it needs the newer version which has support for it. There is work upstream to switch the version to 0.18[0] however it seems that this is still pending, so we can pin it for now until that merges. [0]: https://github.com/fabric8io/docker-maven-plugin/pull/770 Change-Id: I5340a2adad30f0d8cef22b9e67c21e1f36883c14 Issue-ID: CIMAN-154 Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
2018-04-15Update the esr installation doc.LiZi1-25/+29
Change-Id: I44f771dc6545143c274613640b3f0eff52f8b814 Issue-ID: AAI-1029 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-04-09Fix the typos in esr-serverLiZi6-6/+28
Change-Id: I5f27f955e89ec4417b46c0042bb6843985864bfe Issue-ID: DOC-258 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-04-03Update docker tag conventionJessica Wagantall1-1/+1
Update docker tagging convention to use: $VERSION-SNAPSHOT-YYYYMMDDTHHMMSSZ (for dev images) $VERSION-STAGING-YYYYMMDDTHHMMSSZ (for staging images) Change-Id: Ic9181f35ef4b7311b7370135990bf33f9037be58 Issue-ID: CIMAN-132 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-03-29undone upgrade jackson-databindLiZi1-5/+1
According to the nexus IQ reports some other security issues caused by upgrade jackson-databind. Change-Id: I6cfebcdd104c47304185fde024105edea473042c Issue-ID: AAI-592 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-28upgrade jackson-databindLiZi1-1/+5
Change-Id: Ie1f0f67dcc3d47dbf0563eaaf4d3bce239588669 Issue-ID: AAI-592 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-26Upgrade the version of oparent.LiZi2-25/+4
Change-Id: Idc553f92d78c586878a2ffd0e8e7ca5b97252c27 Issue-ID: AAI-941 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-19Change the port config about MSB to 443LiZi2-2/+2
Change-Id: I526a6c484ed19db0c72e1596100d5cb2419cb0f1 Issue-ID: AAI-892 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-12Change the http REST API to https.LiZi4-3/+15
Change-Id: I25365752a881bdda65130ddaabec6305ee31705d Issue-ID: AAI-851 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-05Remove the INFO.yamlLiZi1-51/+0
There are some miss merged message. AAI/esr is a subproject of AAI and the subproject leader is Zi Li, the company should be ZTE. And the committers for ESR are Zi Li and Qi Sun. Change-Id: Ida1e6ad2dd83f5d864d462da7b17bddcb248b885 Issue-ID: CIMAN-134 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-02Merge "Fix the bug about nullpointer when update VIM"Li Zi1-9/+13
2018-03-02Fix the bug about nullpointer when update VIMLiZi1-9/+13
Change-Id: I25d81a88a7fec20a6f1ebca26b727cee64be1d96 Issue-ID: AAI-832 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-02Merge "Add unit test for the newly entity classes."Li Zi4-0/+161
2018-03-02Add unit test for the newly entity classes.LiZi4-0/+161
Change-Id: Ie87f678cdaab10322211b546d5defa1e17a8b3c8 Issue-ID: AAI-831 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-02Merge "Add unit test for the newly API."Li Zi4-15/+46
2018-03-02Add unit test for the newly API.LiZi4-15/+46
Add unit test for the API of query complexes and create relationship between cloud region and complex Change-Id: I1a5b4b53346e820f66946482ce27f4273d842e88 Issue-ID: AAI-830 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-02Merge "Get complex name and put it to cloud region"Li Zi5-5/+51
2018-03-01Get complex name and put it to cloud regionLiZi5-5/+51
Get complex name by query complex object and put it to cloud region when register VIM. Change-Id: I1c5a2537b70de5ec8d3630dec6c8b79981445290 Issue-ID: AAI-829 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-02Merge "Create relationship while register VIM."Li Zi9-25/+140
2018-03-01Create relationship while register VIM.LiZi9-25/+140
Create relationship between cloud region and complex object while register VIM. Change-Id: I8bd121ad653cb27fb8a571d4544c10464e2a1fc4 Issue-ID: AAI-827 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-01Merge "Realize the API to get complex object ID."Li Zi5-2/+112
2018-03-01Realize the API to get complex object ID.LiZi5-2/+112
Change-Id: Ie70a1352fbdd490b0b4e6ac05ea14fbfa38b9678 Issue-ID: AAI-826 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-03-01Merge "Add complex API definition."Li Zi6-22/+138
2018-02-28Add complex API definition.LiZi6-22/+138
Change-Id: I7d1626b9f032901d491be3828db658b01b6d3947 Issue-ID: AAI-823 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-02-26Add INFO.yaml fileJessica Wagantall1-0/+51
Add INFO.yaml to list: - Project description - Properties - PTL information - Meeting information - Committer information Change-Id: I238c5abab91fc2a67e621e5e3a925f26684e5fff Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-02-24Fix the security issue of esr server.LiZi1-0/+12
Fix the security issue CVE-2016-3720 and CVE-2017-17485 Change-Id: I3f7d0c4fb841d72e2b463091a5c4b5e5e81f0611 Issue-ID: AAI-592 Signed-off-by: LiZi <li.zi30@zte.com.cn>
2018-02-07Fix the bug about register MSB.Lizi2-3/+3
When register service to MSB, esr-server still will register to MSB automaticly Change-Id: I69769906e87e6b8c9658b05de60af45ed2b47e82 Issue-ID: AAI-738 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Display ESR API with swaggerLizi6-10/+37
When ESR registered to MSB. The API of esr-server can be visited from MSB portal through swagger Change-Id: I142b79c00920697839f55eac95b50a6072d19ca4 Issue-ID: AAI-735 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Remove the unused variable in vnfmManagerUtilLizi1-6/+3
Fix the sonar issue: https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I2e6a6ff49f91053020eed7ba1daf98c401887170 Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Remove the unused variableLizi1-6/+3
Fix sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#severities=MAJOR|resolved=false Change-Id: I07cb02bfad47e245e0a76030524a1db15948eb2a Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Add a constructive funtion, fix sonar issue.Lizi2-3/+4
Fix the sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I172a75efd156c29faa5b146d73ee1d9d09b5e40a Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Rename variable,fix sonar issue.Lizi1-11/+11
Fix the sonar issue https://sonar.onap.org/component_issues?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MAJOR Change-Id: I18298cfa2366e95a0bdd254498a4d9c8940dd181 Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-06Fix the sonar issue.Lizi4-27/+1
Change-Id: I6894d0773ef37acea819897cd80a4aa0d2b785af Issue-ID: AAI-734 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-02Sonar MinorPrasadNaidu1-2/+2
Rename this field to match the regular expression AaiCommon.java:L24 Sonar link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#resolved=false|severities=MINOR|rules=squid%3AS3008 Location: src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java Change-Id: Id6b6db3ac750c1dadc851822ad59e9d3c97fbddf Issue-ID: AAI-697 Signed-off-by: PrasadNaidu <RV00493633@techmahindra.com>
2018-02-01Merge "Add a private constructor"Li Zi1-0/+3
2018-02-01Merge "Fix the sonar issue."Li Zi1-2/+14
2018-02-01Fix the sonar issue.Lizi1-2/+14
Change-Id: I9f75b3e54ca634c268a8d3f14c29db03d6e263b7 Issue-ID: AAI-723 Signed-off-by: Lizi <li.zi30@zte.com.cn>
2018-02-01Merge "sonar critical for Design"Li Zi1-1/+5
2018-02-01sonar critical for DesignDushyant Singh Thakur1-1/+5
Added a private constructor to hide the implicit public one Sonar Link: https://sonar.onap.org/component_issues/index?id=org.onap.aai.esr-server%3Aaai-esr-server#severities=CRITICAL%2CMAJOR|resolved=false|assignees=dthakur Location: src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java Line No-18 Change-Id: I3f47b6de765f6b14871d58c3c9b0d8d0360a76be Issue-ID: AAI-718 Signed-off-by: Dushyant Singh Thakur <dt00503496@techmahindra.com>