aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-06-03Merge "Refactor WorkflowAsyncResource"Christophe Closset3-44/+34
2017-06-03Merge "Fix WorkflowContext.getDelay() unit conversion"Christophe Closset1-1/+1
2017-05-29[MSO-11] Update TrademarksChrisC1-3/+1
Change-Id: Ic2dc253e46a7879466695635017983b5556b946c Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-05-09Refactor WorkflowAsyncResourceGary Wu3-44/+34
Change-Id: I794b606687343851f71d63ac055ed1898320216a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-05-09Fix WorkflowContext.getDelay() unit conversionGary Wu1-1/+1
The duration numbers in getDelay() are all expressed in milliseconds; the call to TimeUnit.convert() is fixed to specify milliseconds. Change-Id: I6b466f7a40a05ebe4afb1c3c39fb862eef2ae40d Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-05-09[MSO-8] Additional fixes for the second rebaseDeterme, Sebastien (sd378r)124-18801/+15910
DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file not reloaded properly when it's wrong (JSON error or model hierarchy mistake) at MSO startup Change-Id: I2853030b78499e2a761706b643ea210955e72de3 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com> [MSO-8] Restore files removed in patch set 2 Those groovy files must be there Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-05-05Remove redundant class HttpHeaderGary Wu6-586/+325
The functionality of HttpHeader already exists in org.apache.http.message.BasicHeader. This change removes the HttpHeader class and replaces its uses with BasicHeader. Change-Id: I828aa7d94a1968dffd928d4ca719f0beff1a0f4b Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-05-03Merge "Using onap instead of openecomp in doc path"Christophe Closset1-1/+1
2017-05-03[MSO-8] Fix the bad provisioning row for VIDDeterme, Sebastien (sd378r)0-0/+0
There was an error in the VID network BPMN name (for the update) in the sql Change-Id: I720af8996272e101ba0bc6863bf800f921787894 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-05-03Update the sql commandxg353y1-1/+1
Update the network_recipe db table, update the bpmn script to use. Change-Id: I44f84a05629de9f550f8320b633bd9381bbe34e9 Signed-off-by: xg353y <xg353y@intl.att.com>
2017-05-03[MSO-8] Remove files that crash the commonBPMNDeterme, Sebastien (sd378r)15-2517/+0
Some files in commonBPMN have been removed as they prevent the war to be successfully deployed on Jboss + Remove rest interfaces files for catalog that should not be there anymore Change-Id: Iaf83f8b60610624e160feac8a96b7eaed7f161d1 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-05-03Using onap instead of openecomp in doc pathAnaël Closson1-1/+1
Change-Id: I29e1f18e3ae1cf04a989206cf32cfcfd0aec95a6 Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-05-03Merge "Update .gitreview with onap URL"Christophe Closset1-1/+1
2017-05-02[MSO-8] Second step of the rebase for MSODeterme, Sebastien (sd378r)372-57188/+67123
Second rebase containing additional features for MSO + total reworking of the BPMN structure + Notification flow can now be added at the end of some BPMN flows Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-05-02Merge "Simplify InfraUtils"Christophe Closset1-17/+4
2017-05-02Merge "Fix logic error in HealthCheckHandler"Christophe Closset1-1/+1
2017-05-02Merge "Remove boxed types in MavenLikeVersioning"Christophe Closset1-27/+17
2017-05-02Merge "Fix resources leaks: CatalogDatabase"Christophe Closset3-27/+24
2017-05-02Merge "Simplify MsoHeatEnvironmentParameter methods"Christophe Closset1-12/+3
2017-05-02Merge "Add missing defensive copy to APIResponse"Christophe Closset1-7/+9
2017-04-25Add a repository to fix maven buildDeterme, Sebastien (sd378r)1-1/+7
The build was broken due to a snapshot reference, this snapshot repository is missing Change-Id: I301c37fc1c3f64dc64752df39d35780a49a88025 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-04-19Simplify InfraUtilsGary Wu1-17/+4
Change-Id: I23659102feccaa5bf97194e052a6b28cd1e7705f Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-13Remove boxed types in MavenLikeVersioningGary Wu1-27/+17
Remove the unnecessary use of boxed types in MavenLikeVersioning. Change-Id: I8b96db9e753f80860b95b84473bb8d2b61e2328e Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11Fix resources leaks: CatalogDatabaseGary Wu3-27/+24
Change-Id: I3274dc7a64637cd7cf18d705258c0fc4985171ee Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11Fix logic error in HealthCheckHandlerGary Wu1-1/+1
Change-Id: I0d67ad98e2e9b409774532715da3959e47e27d13 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11Add missing defensive copy to APIResponseGary Wu1-7/+9
APIResponse is supposed to be immutable, but was exposing its internals in the getResponseBodyAsByteArray() method. This change adds the missing defensive copy in that method. Change-Id: I8a424a4cb72eb703fb425ffbd30ea70d6592f85a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11Simplify MsoHeatEnvironmentParameter methodsGary Wu1-12/+3
Change-Id: I199008128f28903ea28ecfba437511c4c4a6c8e7 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-11[MSO-8] Update the maven dependencyxg353y840-38682/+90998
Update the maven depenency for sdc-distribution-client to cooperate with the sdc changes. Change-Id: I2da936e5c40cb68c7181bb78307192dd5655b5dc Signed-off-by: xg353y <xg353y@intl.att.com>
2017-04-10Remove unnecessary use of Calendar.getInstance()Gary Wu8-46/+23
Calendar.getInstance() is expensive and unnecessary when we only need the system time. This change replaces the uses of Calendar.getInstance() with System.currentTimeMillis(). Change-Id: I476f8850f5eb88d20cf7249cca5bb2e9b671b45a Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
2017-04-10Merge "Update readme to replace openecomp with onap"Christophe Closset1-23/+23
2017-04-04Update readme to replace openecomp with onapJeremy Phelps1-23/+23
Change-Id: I423b1354d53eb8a55ff9d09a96fc7c15202caa13 Signed-off-by: Jeremy Phelps <jphelps@linuxfoundation.org>
2017-03-30Merge "Update domain URLs from openecomp.org to onap.org"Christophe Closset3-5/+5
2017-03-29Update domain URLs from openecomp.org to onap.orgAndrew Grimberg3-5/+5
The openecomp.org namespace is deprecated in favor of the onap.org namespace Change-Id: Icca272615a21c5c07d4c4341759752e758a45957 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2017-03-29Update .gitreview with onap URLAndrew Grimberg1-1/+1
Change-Id: I8066eca557ad0343b902488485c0c509c129a27d Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2017-03-27Docker image tags reworkedDeterme, Sebastien (sd378r)1-0/+32
Add a groovy script to the pom of the docker module to generate an additional tag to mso and mso-arquillian images. Change-Id: Ica50c2c7166b4401179de711d8ba3e66c7fa129b Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
2017-03-14Merge "Fix OSX build failure:gid # is too big >2097151"Christophe Closset1-0/+1
2017-03-13Update to version 1.1.0ChrisC30-105/+105
Change-Id: Id054e7a04ce88450c3cfe108c8259c4d287681c8 Signed-off-by: ChrisC <cc697w@intl.att.com>
2017-03-09Fix OSX build failure:gid # is too big >2097151Mandeep Khinda1-0/+1
Change-Id: Iad5b15cab366adbaf231919ec0381ee74ccd7976 Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
2017-03-09Update configuration for maven siteAnaël Closson1-2/+3
Change-Id: Ic8b46a7fd2c41b47dd11d4dc4a998de17f53223b Signed-off-by: Anaël Closson <ac2550@intl.att.com>
2017-03-08Merge "Remove duplicate docker-compose"Christophe Closset1-34/+0
2017-03-08Merge "Do not start chef-solo if mso-docker.json is empty"Christophe Closset1-3/+8
2017-03-08Remove duplicate docker-composeAlexis de Talhouët1-34/+0
docker-config repo is holding the docker-compose file, along with all the config files required for mso. Change-Id: I0dec96fd6f767d93154e24611b47373bd2245226 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-08Do not start chef-solo if mso-docker.json is emptyAlexis de Talhouët1-3/+8
Chef-solo is started both from the docker container [1] and from the start-jboss-server.sh script [2]. The Dockerfile is configured to erase the mso-docker.json configuration once applied, so when the container is started, and the strat-jboss-server.sh tries to play the recipes again, it fails as the environment file is empty. This patch adds a check to see if the file is empty, if not, we play the chef-solo recipes again, to overwrite the config. [1]: https://gerrit.openecomp.org/r/gitweb?p=mso.git;a=blob;f=packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final;h=ff7f44bcfdba6fa0328cbd50803d3dc80a2a1def;hb=refs/heads/master#l57 [2]: https://gerrit.openecomp.org/r/gitweb?p=mso.git;a=blob;f=packages/docker/src/main/docker/docker-files/scripts/start-jboss-server.sh;h=2e9b9da27dd3d01fcf5ebc304ac03b15142fde53;hb=refs/heads/master#l16 Change-Id: I34573dedaaafbeb6b511f47b72e6e0cefea4e1d5 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-08Merge "Adding tagging to our staging images"Christophe Closset2-2/+7
2017-03-08Adding tagging to our staging imagesJulienBe2-2/+7
Tags will look like : version-STAGING-commitId If no 'mso.git.commit' passed, last part will be blank Change-Id: I4ba4dc1c6f292e8f1f4d2d0470678712546796e4 Signed-off-by: JulienBe <jb379x@att.com>
2017-03-08OpenECOMP DNS config changeeh552t1-13/+13
In the readme.md file that give an example of value for asdcAddress in mso-docker.json and remove spaces at end of lines Change-Id: I36d19b452951ecf3f5fdf09c4a96c7393b67f808 Signed-off-by: eh552t <eh552t@intl.att.com>
2017-03-07Merge "Hard-code MSO gerrit url"Christophe Closset1-2/+5
2017-03-07Hard-code MSO gerrit urlAlexis de Talhouët1-2/+5
env.GIT_NO_PROJECT is only used in Jenkins. Downstream user don't have knowledge of this variable, but are failing to build because of it. The gerrit url shouldn't be subject to change, hence hard-coding its value in a maven property. Change-Id: Ieed47a282636eafd0556242f56dc0b4d3596ea29 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-07Remove AT&T HTTP proxy URL from Dockerfile(s)Alexis de Talhouët1-3/+3
As this is now open-source code, they shouldn't be any reference to AT&T proxy settings. One can still configure the HTTP proxy by providing its proxy address, and by enabling it in docker-files/settings.xml. Change-Id: I190dc9e01349a9948b2103fb1791191e89b7399d Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2017-03-06Prepare for Release 1.0.0ChrisC3-4/+4
Change-Id: I54ab6edea94e61dd5dbfdb945bda2f51b5d8fc39 Signed-off-by: ChrisC <cc697w@intl.att.com>