summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java8
-rw-r--r--docs/Building_SO.rst4
-rw-r--r--docs/Developer_Info.rst4
-rw-r--r--docs/architecture.rst2
-rw-r--r--docs/images/SO_1.pngbin83586 -> 75897 bytes
-rw-r--r--docs/images/SO_Architecture_1.pngbin123253 -> 126013 bytes
6 files changed, 10 insertions, 8 deletions
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
index 4d2bf59fee..9b00e4e1eb 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
@@ -107,21 +107,21 @@ public class RestfulUtil {
HttpClient client = HttpClientBuilder.create().build();
- if("POST".equals(methodType.toUpperCase())) {
+ if("POST".equalsIgnoreCase(methodType)) {
HttpPost httpPost = new HttpPost(msbUrl);
httpPost.setConfig(requestConfig);
httpPost.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON));
method = httpPost;
- } else if("PUT".equals(methodType.toUpperCase())) {
+ } else if("PUT".equalsIgnoreCase(methodType)) {
HttpPut httpPut = new HttpPut(msbUrl);
httpPut.setConfig(requestConfig);
httpPut.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON));
method = httpPut;
- } else if("GET".equals(methodType.toUpperCase())) {
+ } else if("GET".equalsIgnoreCase(methodType)) {
HttpGet httpGet = new HttpGet(msbUrl);
httpGet.setConfig(requestConfig);
method = httpGet;
- } else if("DELETE".equals(methodType.toUpperCase())) {
+ } else if("DELETE".equalsIgnoreCase(methodType)) {
HttpDelete httpDelete = new HttpDelete(msbUrl);
httpDelete.setConfig(requestConfig);
method = httpDelete;
diff --git a/docs/Building_SO.rst b/docs/Building_SO.rst
index 2e411d5e11..7d68e433cc 100644
--- a/docs/Building_SO.rst
+++ b/docs/Building_SO.rst
@@ -34,7 +34,9 @@ Build software without unit tests
Build docker images
--------------------
-SO docker images are built using the "docker" maven profile. During the build, the chef-repo and so-docker repositories are cloned from gerrit into the "so" directory structure. Extra definitions are required in the build environment to make this happen. You may need to adjust the definition of mso.chef.git.url.prefix to match the way you authenticate yourself when performing git clone.
+SO docker images are built using the "docker" maven profile.
+
+During the build, the chef-repo and so-docker repositories are cloned from gerrit into the "so" directory structure. Extra definitions are required in the build environment to make this happen. You may need to adjust the definition of mso.chef.git.url.prefix to match the way you authenticate yourself when performing git clone.
If you are behind a corporate firewall, you can specify proxy definitions for the constructed docker images.
diff --git a/docs/Developer_Info.rst b/docs/Developer_Info.rst
index d077323f71..579a12d77f 100644
--- a/docs/Developer_Info.rst
+++ b/docs/Developer_Info.rst
@@ -1,6 +1,6 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2017 Huawei Technologies Co., Ltd.
+.. Copyright 2018 Huawei Technologies Co., Ltd.
Developer Information
======================
@@ -10,4 +10,4 @@ Developer Information
Install_Configure_SO.rst
architecture.rst
- offered_consumed_apis.rst \ No newline at end of file
+ \ No newline at end of file
diff --git a/docs/architecture.rst b/docs/architecture.rst
index 1e7777f32c..e988632b96 100644
--- a/docs/architecture.rst
+++ b/docs/architecture.rst
@@ -1,6 +1,6 @@
.. This work is licensed under a Creative Commons Attribution 4.0 International License.
.. http://creativecommons.org/licenses/by/4.0
-.. Copyright 2017 Huawei Technologies Co., Ltd.
+.. Copyright 2018 Huawei Technologies Co., Ltd.
SO - Architecture
===============
diff --git a/docs/images/SO_1.png b/docs/images/SO_1.png
index 8e477acc46..715801330b 100644
--- a/docs/images/SO_1.png
+++ b/docs/images/SO_1.png
Binary files differ
diff --git a/docs/images/SO_Architecture_1.png b/docs/images/SO_Architecture_1.png
index 53836ffd8c..0d84829c61 100644
--- a/docs/images/SO_Architecture_1.png
+++ b/docs/images/SO_Architecture_1.png
Binary files differ