From 0efbd308a9fdc886d662d43119379d9d47eaca0e Mon Sep 17 00:00:00 2001
From: lizi
Date: Thu, 28 Sep 2017 09:59:31 +0800
Subject: [PATCH 01/16] Fix the bug about query VIM.
Fix the bug "If a cloud-region didn't contain a external system info, there will be an null pointer error".
Change-Id: I2cdd45bfc9836ce8369feb4d5af6bc6bcee84201
Issue-ID: AAI-398
Signed-off-by: lizi
---
esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java
index 1fc68a9..2a390d9 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java
@@ -80,7 +80,10 @@ public class VimManagerUtil {
VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
VimAuthInfo vimAuthInfo = new VimAuthInfo();
ArrayList vimAuthInfos = new ArrayList();
- vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+ if(cloudRegion.getEsrSystemInfoList()!=null){
+ vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+ vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
+ }
vimAuthInfos.add(vimAuthInfo);
vimRegisterInfo.setVimAuthInfos(vimAuthInfos);
vimRegisterInfo.setCloudExtraInfo(cloudRegion.getCloudExtraInfo());
@@ -91,7 +94,6 @@ public class VimManagerUtil {
vimRegisterInfo.setComplexName(cloudRegion.getComplexName());
vimRegisterInfo.setCloudRegionVersion(cloudRegion.getCloudRegionVersion());
vimRegisterInfo.setOwnerDefinedType(cloudRegion.getOwnerDefinedType());
- vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
return vimRegisterInfo;
}
}
--
2.16.6
From 01aa61c639256d41029edbe189b919f7d7ee0b90 Mon Sep 17 00:00:00 2001
From: lizi
Date: Thu, 28 Sep 2017 11:16:06 +0800
Subject: [PATCH 02/16] Register ServiceTest to microservice.
Change-Id: I1072eeff36a848eba35b99511e79906a340c4b53
Issue-ID: AAI-400
Signed-off-by: lizi
---
esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
index 5a9510e..adcaa08 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java
@@ -19,6 +19,7 @@ package org.onap.aai.esr;
import org.onap.aai.esr.common.MsbConfig;
import org.onap.aai.esr.externalservice.msb.MsbHelper;
import org.onap.aai.esr.resource.EmsManager;
+import org.onap.aai.esr.resource.ServiceTest;
import org.onap.aai.esr.resource.ThirdpatySdncManager;
import org.onap.aai.esr.resource.VimManager;
import org.onap.aai.esr.resource.VnfmManager;
@@ -52,7 +53,7 @@ public class ExtsysApp extends Application {
environment.jersey().register(new ThirdpatySdncManager());
environment.jersey().register(new VimManager());
environment.jersey().register(new VnfmManager());
-
+ environment.jersey().register(new ServiceTest());
if (configuration.getRegistByHand().equals("true")){
String MSB_IP=configuration.getMsbDiscoveryIp();
Integer MSB_Port= Integer.valueOf(configuration.getMsbDiscoveryPort());
--
2.16.6
From b7234908efba931eb3446983c5800bdeb6404b47 Mon Sep 17 00:00:00 2001
From: lizi
Date: Mon, 9 Oct 2017 16:26:04 +0800
Subject: [PATCH 03/16] Add a way to get MSB address in esr-server.
Change-Id: Ib4eaa9e976554a004955c16c85a67dd17ef0cbed
Issue-ID: AAI-420
Signed-off-by: lizi
---
standalone/src/main/assembly/Dockerfile | 3 +-
standalone/src/main/assembly/conf/extsys.yml | 2 +-
standalone/src/main/assembly/docker/LICENSE | 473 +++++++++++++++++++++
.../src/main/assembly/docker/docker-entrypoint.sh | 25 ++
.../src/main/assembly/docker/instance_config.sh | 9 +
.../src/main/assembly/docker/instance_run.sh | 8 +
6 files changed, 518 insertions(+), 2 deletions(-)
create mode 100644 standalone/src/main/assembly/docker/LICENSE
create mode 100644 standalone/src/main/assembly/docker/docker-entrypoint.sh
create mode 100644 standalone/src/main/assembly/docker/instance_config.sh
create mode 100644 standalone/src/main/assembly/docker/instance_run.sh
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 0903fd5..952c871 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -22,5 +22,6 @@ WORKDIR /home/esr
ADD esr-server-*-linux64.tar.gz /home/esr/
RUN chmod 755 /home/esr/bin/*.sh
-ENTRYPOINT /home/esr/bin/run.sh
+#ENTRYPOINT /home/esr/bin/run.sh
+ENTRYPOINT /home/esr/docker/docker-entrypoint.sh
diff --git a/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml
index c06c70f..dc67e25 100644
--- a/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml
@@ -19,7 +19,7 @@ template: Hello, %s!
#defaultName: ${DW_DEFAULT_NAME:-Stranger}
# the micro service ip
serviceIp:
-msbDiscoveryIp: 127.0.0.1
+msbDiscoveryIp: 10.74.148.80
msbDiscoveryPort: 10081
msbServerAddr: http://10.74.148.80:80
registByHand: true
diff --git a/standalone/src/main/assembly/docker/LICENSE b/standalone/src/main/assembly/docker/LICENSE
new file mode 100644
index 0000000..bebcc7f
--- /dev/null
+++ b/standalone/src/main/assembly/docker/LICENSE
@@ -0,0 +1,473 @@
+THIS LICENSE FILE CONTAINS THE LICENSE APPLICABLE DEPENDING ON THE TYPE OF CONTRIBUTIONS.
+
+APACHE LICENSE 2 IS APPLICABLE FOR SOURCE CODE, CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL FOR DOCUMENTATION
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Attribution 4.0 International
+
+https://creativecommons.org/licenses/by/4.0/legalcode
+
+---------------------------------------------------------------------------------------
+
+Creative Commons Corporation ("Creative Commons") is not a law firm and
+does not provide legal services or legal advice. Distribution of
+Creative Commons public licenses does not create a lawyer-client or
+other relationship. Creative Commons makes its licenses and related
+information available on an "as-is" basis. Creative Commons gives no
+warranties regarding its licenses, any material licensed under their
+terms and conditions, or any related information. Creative Commons
+disclaims all liability for damages resulting from their use to the
+fullest extent possible.
+
+Using Creative Commons Public Licenses
+
+Creative Commons public licenses provide a standard set of terms and
+conditions that creators and other rights holders may use to share
+original works of authorship and other material subject to copyright
+and certain other rights specified in the public license below. The
+following considerations are for informational purposes only, are not
+exhaustive, and do not form part of our licenses.
+
+ Considerations for licensors: Our public licenses are
+ intended for use by those authorized to give the public
+ permission to use material in ways otherwise restricted by
+ copyright and certain other rights. Our licenses are
+ irrevocable. Licensors should read and understand the terms
+ and conditions of the license they choose before applying it.
+ Licensors should also secure all rights necessary before
+ applying our licenses so that the public can reuse the
+ material as expected. Licensors should clearly mark any
+ material not subject to the license. This includes other CC-
+ licensed material, or material used under an exception or
+ limitation to copyright. More considerations for licensors:
+ wiki.creativecommons.org/Considerations_for_licensors
+
+ Considerations for the public: By using one of our public
+ licenses, a licensor grants the public permission to use the
+ licensed material under specified terms and conditions. If
+ the licensor's permission is not necessary for any reason--for
+ example, because of any applicable exception or limitation to
+ copyright--then that use is not regulated by the license. Our
+ licenses grant only permissions under copyright and certain
+ other rights that a licensor has authority to grant. Use of
+ the licensed material may still be restricted for other
+ reasons, including because others have copyright or other
+ rights in the material. A licensor may make special requests,
+ such as asking that all changes be marked or described.
+ Although not required by our licenses, you are encouraged to
+ respect those requests where reasonable. More_considerations
+ for the public:
+ wiki.creativecommons.org/Considerations_for_licensees
+
+---------------------------------------------------------------------------------------
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+---------------------------------------------------------------------------------------
+
+Creative Commons is not a party to its public
+licenses. Notwithstanding, Creative Commons may elect to apply one of
+its public licenses to material it publishes and in those instances
+will be considered the "Licensor." The text of the Creative Commons
+public licenses is dedicated to the public domain under the CC0 Public
+Domain Dedication. Except for the limited purpose of indicating that
+material is shared under a Creative Commons public license or as
+otherwise permitted by the Creative Commons policies published at
+creativecommons.org/policies, Creative Commons does not authorize the
+use of the trademark "Creative Commons" or any other trademark or logo
+of Creative Commons without its prior written consent including,
+without limitation, in connection with any unauthorized modifications
+to any of its public licenses or any other arrangements,
+understandings, or agreements concerning use of licensed material. For
+the avoidance of doubt, this paragraph does not form part of the
+public licenses.
+
+Creative Commons may be contacted at creativecommons.org.
diff --git a/standalone/src/main/assembly/docker/docker-entrypoint.sh b/standalone/src/main/assembly/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..93e5973
--- /dev/null
+++ b/standalone/src/main/assembly/docker/docker-entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ -z "$SERVICE_IP" ]; then
+ export SERVICE_IP=`hostname -i`
+fi
+echo "SERVICE_IP=$SERVICE_IP"
+
+if [ -z "$MSB_ADDR" ]; then
+ echo "Missing required variable MSB_ADDR: Microservices Service Bus address :"
+ exit 1
+fi
+echo "MSB_ADDR=$MSB_ADDR"
+
+# Wait for MSB initialization
+echo "Wait for MSB initialization"
+for i in {1..5}; do
+ curl -sS -m 1 $MSB_ADDR > /dev/null && break
+ sleep $i
+done
+
+# Configure service based on docker environment variables
+/home/esr/docker/instance_config.sh
+
+# Start the microservice
+/home/esr/docker/instance_run.sh
diff --git a/standalone/src/main/assembly/docker/instance_config.sh b/standalone/src/main/assembly/docker/instance_config.sh
new file mode 100644
index 0000000..29fa1ca
--- /dev/null
+++ b/standalone/src/main/assembly/docker/instance_config.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
+MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
+
+sed -i "s|msbDiscoveryIp.*|msbDiscoveryIp = '$MSB_IP'|" /home/esr/conf/extsys.yml
+sed -i "s|msbServerAddr.*|msbServerAddr = 'http://$MSB_IP:80'|" /home/esr/conf/extsys.yml
+
+cat /home/esr/conf/extsys.yml
diff --git a/standalone/src/main/assembly/docker/instance_run.sh b/standalone/src/main/assembly/docker/instance_run.sh
new file mode 100644
index 0000000..091ce08
--- /dev/null
+++ b/standalone/src/main/assembly/docker/instance_run.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+cd /home/esr/bin
+./run.sh
+
+while [ ! -f ../works/logs/extsys.log ]; do
+ sleep 1
+done
+tail -F ../works/logs/extsys.log
--
2.16.6
From 5643f9a5d8a9463e6de6bbfe4eaf441b9351af01 Mon Sep 17 00:00:00 2001
From: lizi
Date: Mon, 9 Oct 2017 19:01:31 +0800
Subject: [PATCH 04/16] Fix the extsys.yml config.
Change-Id: Ie6835e9c3c1abb1a05e6996f8c3c82f92b7a5a13
Issue-ID: AAI-420
Signed-off-by: lizi
---
standalone/src/main/assembly/docker/instance_config.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/standalone/src/main/assembly/docker/instance_config.sh b/standalone/src/main/assembly/docker/instance_config.sh
index 29fa1ca..4944df7 100644
--- a/standalone/src/main/assembly/docker/instance_config.sh
+++ b/standalone/src/main/assembly/docker/instance_config.sh
@@ -3,7 +3,7 @@
MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
-sed -i "s|msbDiscoveryIp.*|msbDiscoveryIp = '$MSB_IP'|" /home/esr/conf/extsys.yml
-sed -i "s|msbServerAddr.*|msbServerAddr = 'http://$MSB_IP:80'|" /home/esr/conf/extsys.yml
+sed -i "s|msbDiscoveryIp.*|msbDiscoveryIp: $MSB_IP|" /home/esr/conf/extsys.yml
+sed -i "s|msbServerAddr.*|msbServerAddr: http://$MSB_IP:80|" /home/esr/conf/extsys.yml
cat /home/esr/conf/extsys.yml
--
2.16.6
From 5e1ac5e71b590720862e6a9f7e6dc7642b555bd1 Mon Sep 17 00:00:00 2001
From: lizi
Date: Tue, 10 Oct 2017 16:26:26 +0800
Subject: [PATCH 05/16] Fix the artifact of esr-server.
Change-Id: I9346c599437530f34471a4381c7271c2ffcbde91
Issue-ID: AAI-426
Signed-off-by: lizi
---
esr-mgr/dependency-reduced-pom.xml | 2 +-
esr-mgr/pom.xml | 2 +-
pom.xml | 2 +-
standalone/pom.xml | 2 +-
standalone/src/main/assembly/docker/instance_run.sh | 8 ++++----
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml
index e2448bd..4407846 100644
--- a/esr-mgr/dependency-reduced-pom.xml
+++ b/esr-mgr/dependency-reduced-pom.xml
@@ -1,7 +1,7 @@
- aai-esr-server-parent
+ aai-esr-server
org.onap.aai.esr-server
1.0.0-SNAPSHOT
diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml
index 5ccf3e5..0b68548 100644
--- a/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -20,7 +20,7 @@
org.onap.aai.esr-server
- aai-esr-server-parent
+ aai-esr-server
1.0.0-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 52a621b..c00f854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
org.onap.aai.esr-server
- aai-esr-server-parent
+ aai-esr-server
pom
1.0.0-SNAPSHOT
diff --git a/standalone/pom.xml b/standalone/pom.xml
index aa9185e..b3bc7b2 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -19,7 +19,7 @@
org.onap.aai.esr-server
- aai-esr-server-parent
+ aai-esr-server
1.0.0-SNAPSHOT
diff --git a/standalone/src/main/assembly/docker/instance_run.sh b/standalone/src/main/assembly/docker/instance_run.sh
index 091ce08..4384486 100644
--- a/standalone/src/main/assembly/docker/instance_run.sh
+++ b/standalone/src/main/assembly/docker/instance_run.sh
@@ -1,8 +1,8 @@
#!/bin/bash
-cd /home/esr/bin
-./run.sh
+cd /home/esr
+./bin/run.sh
-while [ ! -f ../works/logs/extsys.log ]; do
+while [ ! -f works/logs/extsys.log ]; do
sleep 1
done
-tail -F ../works/logs/extsys.log
+tail -F works/logs/extsys.log
--
2.16.6
From 55a79cda57eb2386f5b13d1f04b0b803d231535f Mon Sep 17 00:00:00 2001
From: lizi
Date: Tue, 10 Oct 2017 19:57:08 +0800
Subject: [PATCH 06/16] Add installation guide and api link for doc.
Change-Id: I842c9d2795df1e6f6236caf1bd5c6a5fb629e8d1
Issue-ID: AAI-427
Signed-off-by: lizi
---
docs/index.rst | 2 +-
docs/installation.rst | 6 ++++++
docs/offeredapis.rst | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 docs/installation.rst
diff --git a/docs/index.rst b/docs/index.rst
index f101744..7b01229 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -15,5 +15,5 @@ ESR comprises two modules: the esr server module and the esr gui module. And bot
:maxdepth: 1
offeredapis.rst
-
+ installation.rst
diff --git a/docs/installation.rst b/docs/installation.rst
new file mode 100644
index 0000000..25da181
--- /dev/null
+++ b/docs/installation.rst
@@ -0,0 +1,6 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+Installation
+------------
+- `ESR setup `_.
\ No newline at end of file
diff --git a/docs/offeredapis.rst b/docs/offeredapis.rst
index 8f33185..a792f3c 100644
--- a/docs/offeredapis.rst
+++ b/docs/offeredapis.rst
@@ -19,4 +19,4 @@ The esr server module provides the following APIs.
* thirdparty SDNC update
* thirdparty SDNC Deletion
-
+- `ESR APIs `_.
--
2.16.6
From 63d428bae79684c1cd309bf3299876eec4b6f4b1 Mon Sep 17 00:00:00 2001
From: lizi
Date: Tue, 10 Oct 2017 20:08:15 +0800
Subject: [PATCH 07/16] Remove the oparent snapshot version dependency.
Change-Id: I503ed24490c46e1365052719094571d77ae28f9e
Issue-ID: AAI-428
Signed-off-by: lizi
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c00f854..74a131f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
org.onap.oparent
oparent
- 1.0.0-SNAPSHOT
+ 0.1.1
org.onap.aai.esr-server
--
2.16.6
From efba85da697abf7f082ab23b5c70e79c38c517db Mon Sep 17 00:00:00 2001
From: lizi
Date: Wed, 11 Oct 2017 10:14:16 +0800
Subject: [PATCH 08/16] Remove the snapshot dependency of java-sdk.
Change-Id: I50532592da763756cdc657e0c5f960c997689ec8
Issue-ID: AAI-428
Signed-off-by: lizi
---
esr-mgr/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/esr-mgr/pom.xml b/esr-mgr/pom.xml
index 0b68548..7f9057d 100644
--- a/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -197,7 +197,7 @@
org.onap.msb.java-sdk
msb-java-sdk
- 1.0.0-SNAPSHOT
+ 1.0.0
--
2.16.6
From c6513385acc892dbaf1883df9f93b519e7c49207 Mon Sep 17 00:00:00 2001
From: lizi
Date: Wed, 11 Oct 2017 11:41:41 +0800
Subject: [PATCH 09/16] Add doc framwork for esr.
Change-Id: Iefca392d8367e1a7acbde2ddc5647ad6829ec0ce
Issue-ID: AAI-427
Signed-off-by: lizi
---
docs/index.rst | 4 ++--
docs/platform/administration.rst | 15 +++++++++++++++
docs/platform/architecture.rst | 7 +++++++
docs/platform/configuration.rst | 8 ++++++++
docs/platform/consumedapis.rst | 7 +++++++
docs/platform/delivery.rst | 9 +++++++++
docs/platform/human-interfaces.rst | 15 +++++++++++++++
docs/platform/index.rst | 19 +++++++++++++++++++
docs/{ => platform}/installation.rst | 2 +-
docs/platform/log-and-diagnostic-info.rst | 14 ++++++++++++++
docs/{ => platform}/offeredapis.rst | 2 +-
docs/release-notes/bug-fixes.rst | 4 ++++
docs/release-notes/index.rst | 15 +++++++++++++++
docs/release-notes/known-issues.rst | 4 ++++
docs/release-notes/new-features.rst | 4 ++++
docs/release-notes/security-issues.rst | 4 ++++
docs/release-notes/upgrade-notes.rst | 4 ++++
17 files changed, 133 insertions(+), 4 deletions(-)
create mode 100644 docs/platform/administration.rst
create mode 100644 docs/platform/architecture.rst
create mode 100644 docs/platform/configuration.rst
create mode 100644 docs/platform/consumedapis.rst
create mode 100644 docs/platform/delivery.rst
create mode 100644 docs/platform/human-interfaces.rst
create mode 100644 docs/platform/index.rst
rename docs/{ => platform}/installation.rst (65%)
create mode 100644 docs/platform/log-and-diagnostic-info.rst
rename docs/{ => platform}/offeredapis.rst (97%)
create mode 100644 docs/release-notes/bug-fixes.rst
create mode 100644 docs/release-notes/index.rst
create mode 100644 docs/release-notes/known-issues.rst
create mode 100644 docs/release-notes/new-features.rst
create mode 100644 docs/release-notes/security-issues.rst
create mode 100644 docs/release-notes/upgrade-notes.rst
diff --git a/docs/index.rst b/docs/index.rst
index 7b01229..61fadd1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,6 +14,6 @@ ESR comprises two modules: the esr server module and the esr gui module. And bot
.. toctree::
:maxdepth: 1
- offeredapis.rst
- installation.rst
+ platform/index.rst
+ release-notes/index.rst
diff --git a/docs/platform/administration.rst b/docs/platform/administration.rst
new file mode 100644
index 0000000..5213df7
--- /dev/null
+++ b/docs/platform/administration.rst
@@ -0,0 +1,15 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+Administration
+--------------
+
+Processes
+^^^^^^^^^
+* Process 1
+* Process 2
+
+Actions
+^^^^^^^
+* Action X
+* Action Y
diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst
new file mode 100644
index 0000000..18d38b0
--- /dev/null
+++ b/docs/platform/architecture.rst
@@ -0,0 +1,7 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+Architecture
+------------
+
+
diff --git a/docs/platform/configuration.rst b/docs/platform/configuration.rst
new file mode 100644
index 0000000..cedb443
--- /dev/null
+++ b/docs/platform/configuration.rst
@@ -0,0 +1,8 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+Configuration
+-------------
+
+No machanism for customized configurtions is provided in the Amsterdam release. Such functionalities will be provided in the future if necessary.
+
diff --git a/docs/platform/consumedapis.rst b/docs/platform/consumedapis.rst
new file mode 100644
index 0000000..5124ec4
--- /dev/null
+++ b/docs/platform/consumedapis.rst
@@ -0,0 +1,7 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+Consumed APIs
+-------------
+
+In the Amsterdam release, Holmes does not consume any APIs provided by other ONAP components.
diff --git a/docs/platform/delivery.rst b/docs/platform/delivery.rst
new file mode 100644
index 0000000..27b3770
--- /dev/null
+++ b/docs/platform/delivery.rst
@@ -0,0 +1,9 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+
+Delivery
+--------
+
+Describe how functions are packaged into run-time components. For some components a block diagram may be useful.
+
+**TO BE DONE**
\ No newline at end of file
diff --git a/docs/platform/human-interfaces.rst b/docs/platform/human-interfaces.rst
new file mode 100644
index 0000000..e8501d0
--- /dev/null
+++ b/docs/platform/human-interfaces.rst
@@ -0,0 +1,15 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+Human Interfaces
+----------------
+Provide info on the targeted user, interface types, ports/protocols to access, etc.
+
+Target Users
+^^^^^^^^^^^^
+
+Interface Type
+^^^^^^^^^^^^^^
+
+Access
+^^^^^^
\ No newline at end of file
diff --git a/docs/platform/index.rst b/docs/platform/index.rst
new file mode 100644
index 0000000..244820f
--- /dev/null
+++ b/docs/platform/index.rst
@@ -0,0 +1,19 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Platform
+--------
+
+ESR provide a way to register external system which not included in ONAP system, mainly inclouded VIM/VNFM/EMS/thirdparty SDNC.
+
+.. toctree::
+ :maxdepth: 1
+
+ architecture.rst
+ offeredapis.rst
+ consumedapis.rst
+ delivery.rst
+ log-and-diagnostic-info.rst
+ installation.rst
+ configuration.rst
+ administration.rst
+ human-interfaces.rst
diff --git a/docs/installation.rst b/docs/platform/installation.rst
similarity index 65%
rename from docs/installation.rst
rename to docs/platform/installation.rst
index 25da181..93a658c 100644
--- a/docs/installation.rst
+++ b/docs/platform/installation.rst
@@ -3,4 +3,4 @@
Installation
------------
-- `ESR setup `_.
\ No newline at end of file
+- `ESR setup `_.
diff --git a/docs/platform/log-and-diagnostic-info.rst b/docs/platform/log-and-diagnostic-info.rst
new file mode 100644
index 0000000..4bda4ba
--- /dev/null
+++ b/docs/platform/log-and-diagnostic-info.rst
@@ -0,0 +1,14 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+Logging & Diagnostic Information
+---------------------------------
+
+Description of how to interact with and diagnose problems with the components as delivered.
+
+Where to Access Information
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+Error / Warning Messages
+^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/offeredapis.rst b/docs/platform/offeredapis.rst
similarity index 97%
rename from docs/offeredapis.rst
rename to docs/platform/offeredapis.rst
index a792f3c..bfbf999 100644
--- a/docs/offeredapis.rst
+++ b/docs/platform/offeredapis.rst
@@ -19,4 +19,4 @@ The esr server module provides the following APIs.
* thirdparty SDNC update
* thirdparty SDNC Deletion
-- `ESR APIs `_.
+- `ESR APIs `_.
\ No newline at end of file
diff --git a/docs/release-notes/bug-fixes.rst b/docs/release-notes/bug-fixes.rst
new file mode 100644
index 0000000..4dc09fc
--- /dev/null
+++ b/docs/release-notes/bug-fixes.rst
@@ -0,0 +1,4 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Bug Fixes
+---------
diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
new file mode 100644
index 0000000..0ca2ea8
--- /dev/null
+++ b/docs/release-notes/index.rst
@@ -0,0 +1,15 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Release-notes
+-------------
+
+ESR provide a way to register external system which not included in ONAP system, mainly inclouded VIM/VNFM/EMS/thirdparty SDNC.
+
+.. toctree::
+ :maxdepth: 1
+
+ new-features.rst
+ bug-fixes.rst
+ upgrade-notes.rst
+ security-issues.rst
+ known-issues.rst
diff --git a/docs/release-notes/known-issues.rst b/docs/release-notes/known-issues.rst
new file mode 100644
index 0000000..f4341d7
--- /dev/null
+++ b/docs/release-notes/known-issues.rst
@@ -0,0 +1,4 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Known Issues
+------------
diff --git a/docs/release-notes/new-features.rst b/docs/release-notes/new-features.rst
new file mode 100644
index 0000000..f548910
--- /dev/null
+++ b/docs/release-notes/new-features.rst
@@ -0,0 +1,4 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+New Features
+------------
diff --git a/docs/release-notes/security-issues.rst b/docs/release-notes/security-issues.rst
new file mode 100644
index 0000000..3a6cd9e
--- /dev/null
+++ b/docs/release-notes/security-issues.rst
@@ -0,0 +1,4 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Security Issues
+---------------
diff --git a/docs/release-notes/upgrade-notes.rst b/docs/release-notes/upgrade-notes.rst
new file mode 100644
index 0000000..29e67e5
--- /dev/null
+++ b/docs/release-notes/upgrade-notes.rst
@@ -0,0 +1,4 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+Upgrade Notes
+-------------
--
2.16.6
From c7cbd5376f00cf2e5e060075a2a7666e6318fd29 Mon Sep 17 00:00:00 2001
From: lizi
Date: Wed, 11 Oct 2017 15:28:54 +0800
Subject: [PATCH 10/16] Add the installation detail of esr.
Change-Id: Ib1533a6faf77f2dd56f33ea62f2fd71811f09346
Issue-ID: AAI-427
Signed-off-by: lizi
---
docs/platform/installation.rst | 87 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 86 insertions(+), 1 deletion(-)
diff --git a/docs/platform/installation.rst b/docs/platform/installation.rst
index 93a658c..d936567 100644
--- a/docs/platform/installation.rst
+++ b/docs/platform/installation.rst
@@ -3,4 +3,89 @@
Installation
------------
-- `ESR setup `_.
+
+Install docker
+^^^^^^^^^^^^^^^^^^^^^^^
+
+sudo apt-add-repository 'deb https://apt.dockerproject.org/repo ubuntu-xenial main'
+
+sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+
+sudo apt-get update
+
+apt-cache policy docker-engine
+
+sudo apt-get install -y docker-engine
+
+docker ps
+
+Run esr-server docker
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Login the ONAP docker registry first: sudo docker login -u docker -p docker nexus3.onap.org:10001
+
+sudo docker run -p 9518:9518 -d --net=host --name esr-server -e MSB_ADDR=${MSB_SERVER_IP}:80 nexus3.onap.org:10001/onap/aai/esr-server
+
+Run esr-gui docker
+^^^^^^^^^^^^^^^^^^^^^^^
+
+sudo docker run -p 8080:9519 -d --net=host --name esr-gui nexus3.onap.org:10001/onap/aai/esr-gui
+
+Check status of ESR
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Test whether esr-server is runing:
+
+GET http://ESR_SERVICE_IP:9518/api/aai-esr-server/v1/test
+
+The returned status should be 200.
+
+Visit ESR portal:
+
+http://ESR_SERVER_IP:9519/esr-gui/extsys/vnfm/vnfmView.html
+
+http://ESR_SERVER_IP:9519/esr-gui/extsys/sdncontroller/sdncView.html
+
+http://ESR_SERVER_IP:9519/esr-gui/extsys/vim/vimView.html
+
+http://ESR_SERVER_IP:9519/esr-gui/extsys/ems/emsView.html
+
+A&AI register to MSB
+^^^^^^^^^^^^^^^^^^^^^^^
+
+NOTE: The way bellow is register to MSB by hand, it is a temporary method. Later it will be registered automatic by MSB.
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "A&AI_SERVER_IP","port": "8443"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "visualRange":"1", "nodes": [ {"ip": "A&AI_SERVER_IP","port": "8443"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+MultiCloud register to MSB
+^^^^^^^^^^^^^^^^^^^^^^^
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9001"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9004"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9006"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST", "nodes": [ {"ip": "'$MultiCloud_IP'","port": "9005"}]}' "http://$MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+ESR register to MSB
+^^^^^^^^^^^^^^^^^^^^^^^
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "ESR_SERVER_IP","port": "9518"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "url": "/esr-gui","protocol": "UI", "visualRange":"1", "path":"/iui/aai-esr-gui", "nodes": [ {"ip": "ESR_SERVER_IP","port": "9519"}]}' "http://MSB_SERVER_IP:10081/api/microservices/v1/services"
+
+ESR usage
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Visit ESR portal to manage the external systems.
+
+http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/vnfm/vnfmView.html
+
+http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/sdncontroller/sdncView.html
+
+http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/vim/vimView.html
+
+http://MSB_SERVER_IP:80/iui/aai-esr-gui/extsys/ems/emsView.html
\ No newline at end of file
--
2.16.6
From 62d9cb474f057cb5a5a80fd52e7c497bb7a77dca Mon Sep 17 00:00:00 2001
From: lizi
Date: Wed, 11 Oct 2017 16:54:32 +0800
Subject: [PATCH 11/16] Add ESR architecture detail.
Change-Id: I3ffac8c813ee9f251b63bfd17a21edb03ff86d97
Issue-ID: AAI-427
Signed-off-by: lizi
---
docs/platform/architecture.rst | 23 +++++++++++++++++++++
docs/platform/images/esr-architecture.PNG | Bin 0 -> 130313 bytes
.../images/external-system-register-progress.PNG | Bin 0 -> 28468 bytes
.../external-system-register-sequence-diagram.PNG | Bin 0 -> 57223 bytes
docs/platform/images/vim-register-progress.PNG | Bin 0 -> 27554 bytes
5 files changed, 23 insertions(+)
create mode 100644 docs/platform/images/esr-architecture.PNG
create mode 100644 docs/platform/images/external-system-register-progress.PNG
create mode 100644 docs/platform/images/external-system-register-sequence-diagram.PNG
create mode 100644 docs/platform/images/vim-register-progress.PNG
diff --git a/docs/platform/architecture.rst b/docs/platform/architecture.rst
index 18d38b0..cb658ef 100644
--- a/docs/platform/architecture.rst
+++ b/docs/platform/architecture.rst
@@ -4,4 +4,27 @@
Architecture
------------
+ESR contains two components: esr server module and esr gui module
+- ESR
+ - ESR server
+ - ESR gui
+
+ONAP-level Architecture
+^^^^^^^^^^^^^^^^^^^^^^^
+
+In ONAP architecture, ESR is a sub-project of A&AI. It provide a single point for users to manage the external system information. It provides a way to register/unregister external system dynamically.
+
+.. image:: images/esr-architecture.PNG
+
+How ESR works
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The user register external system through esr-gui, esr-server will store the external system information to A&AI. And the other components such as VF-C/SDNC/Multi-Cloud then can query the external system information form A&AI. The process of VIM register may be a bit different from the VNFM/EMS/thirdparty SDNC. That because the registered VIM information is some basic information such as region/version/auth-url that things, Multi-Cloud will update the cloud information with more details, such as the volume and tenant details. The VNFM/EMS/thirdparty SDNC will not be updated by VF-C and SDNC.
+
+.. image:: images/vim-register-progress.PNG
+.. image:: images/external-system-register-progress.PNG
+
+The complete workflow is shown below in the form of a sequence diagram.
+
+.. image:: images/external-system-register-sequence-diagram.PNG
\ No newline at end of file
diff --git a/docs/platform/images/esr-architecture.PNG b/docs/platform/images/esr-architecture.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..982a51943807d952de2717175ec3841d78cbba9f
GIT binary patch
literal 130313
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
Ix0JH4Y(n^UQ8iJE|
zn(YsP%5!=GNEQAB7{_FCz;95+2*(QW9`U=tz0A)A7DUoSrBK6jnolGq3mzrT1nKh2
z+Y_YJC=uc#k{B!{g&^ueeS7W`kP=aAVoT$kXU48V3cd!tOU*(#3{~w;jf@iqGG6c$
z`9ul|GxjtS6Z9XBgQrS!`5?xIsJHP?tCaRgzJxKeFq1-N=gHa`^ixV>2w=Xvya=_h
z*1L%cBT2Tw_qlFSFJC4*7|FV2hQcd!7%Mr`pV?}L4j$rZxjPB{TtgIZ1ziF!i-pZx?oe(TxP35Mq=;8fqJ+AE$PHUSt-}HQ}6YppGVi
zL@>RHso}OaicU&vQra9v&Emz~3#8?8>rPf#NbG0ja-g?@d6iJ3#$0z<1+S`>%9iF(
z$7#Y3!Hs{(|M%{V;kW_M5DnEEa51!RJBMA&6(`YseWAr|!Az-U9nkeqYP3`Zmxav)
zJy*+zh-vjhNe+Pz$;!5@uR@xlk+2zS2$NRyH>1{R)^ZQ$B$Q2~am~6HyTt%wPn`!6
zDu#U^B_z-YK*q~iisat5%Ha&MARdabLiD|<7B~R0(%VZt*&_zJR~u;YrYREa6gWyg
zl}SqgI0RHN7!we9)lepk_QrK_imi$aN^i93&sK15+1Y0-h6E8C4(4&|Mh!7|hJ)f{
z=BDvIyxgDzyOgpwspoxIU*vCklIs5@E~Th}<8mI=J9G7Ya|?ZU@IWCGNfkK-@k)x?
z?wK??_+d0W)C3D~M4JPs{2kTowedJv5n%0A!rU3cS5OSdI;p(~8|DI=U$~%wr;rFv
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