aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/esr/Chart.yaml
diff options
context:
space:
mode:
authorLiZi <li.zi30@zte.com.cn>2018-03-14 22:07:08 -0400
committerLiZi <li.zi30@zte.com.cn>2018-03-18 21:11:11 -0400
commitd87e8b869b03cf85dcebc3d817f64d265b9ba98d (patch)
treed7fd08ad160ebcfe6d516b9eb7a85769259cf309 /kubernetes/esr/Chart.yaml
parent0947cdf7e780641e1604ef3752483fa4d29efb3e (diff)
Add a filebeat container together with esr-server
With this modification, the log of esr-server will be in filebeat. Change-Id: I647fc665ed383b58c14a34d6598e41cd6842b1ec Issue-ID: AAI-756 Signed-off-by: LiZi <li.zi30@zte.com.cn>
Diffstat (limited to 'kubernetes/esr/Chart.yaml')
-rw-r--r--kubernetes/esr/Chart.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index 8f55bd69a8..2df1530e48 100644
--- a/kubernetes/esr/Chart.yaml
+++ b/kubernetes/esr/Chart.yaml
@@ -1,4 +1,4 @@
apiVersion: v1
description: A Helm chart for Kubernetes
name: esr
-version: 1.1.0
+version: v1.0.0
d='n103' href='#n103'>103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 
/*
 * ============LICENSE_START==========================================
 * ONAP Portal SDK
 * ===================================================================
 * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
 * ===================================================================
 *
 * Unless otherwise specified, all software contained herein is licensed
 * under the Apache License, Version 2.0 (the “License”);
 * you may not use this software except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *             http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 * Unless otherwise specified, all documentation contained herein is licensed
 * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
 * you may not use this documentation except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *             https://creativecommons.org/licenses/by/4.0/
 *
 * Unless required by applicable law or agreed to in writing, documentation
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 * ============LICENSE_END============================================
 *
 * ECOMP is a trademark and service mark of AT&T Intellectual Property.
 */
package org.onap.portalsdk.rnotebookintegration.controller;

import java.util.HashMap;
import java.util.Iterator;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.json.JSONObject;
import org.onap.portalsdk.core.controller.RestrictedBaseController;
import org.onap.portalsdk.core.domain.User;
import org.onap.portalsdk.core.restful.domain.EcompUser;
import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.portalsdk.core.web.support.UserUtils;
import org.onap.portalsdk.rnotebookintegration.exception.RNotebookIntegrationException;
import org.onap.portalsdk.rnotebookintegration.service.RNoteBookIntegrationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;

@Controller
@RequestMapping("/rNotebookFE/")
public class RNoteBookFEController extends RestrictedBaseController {
	@Autowired
	private RNoteBookIntegrationService rNoteBookIntegrationService;
	
	

	public RNoteBookIntegrationService getrNoteBookIntegrationService() {
		return rNoteBookIntegrationService;
	}



	public void setrNoteBookIntegrationService(
			RNoteBookIntegrationService rNoteBookIntegrationService) {
		this.rNoteBookIntegrationService = rNoteBookIntegrationService;
	}
	
	@RequestMapping(value = { "authCr" }, method = RequestMethod.POST, produces = "application/json")
	public @ResponseBody ResponseEntity<String> saveRNotebookCredentials (@RequestBody String notebookId, HttpServletRequest request,
			HttpServletResponse response) throws Exception {
		//ObjectMapper mapper = new ObjectMapper();
		//mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
		//JsonNode root = mapper.readTree(request.getReader());
		//String token = root.get("authenticationToken").textValue();
		System.out.println("Notebook id "+notebookId);
		System.out.println("Query parameters "+request.getParameter("qparams"));
		String retUrl = "";
		try{
			
			User user = UserUtils.getUserSession(request);
			user = (User) this.getDataAccessService().getDomainObject(User.class, user.getId(), null);
			
			EcompUser ecUser =UserUtils.convertToEcompUser(user);
			
			HashMap<String, String> map = new HashMap<String, String>();
	        JSONObject jObject = new JSONObject(request.getParameter("qparams"));
	        Iterator<?> keys = jObject.keys();

	        while( keys.hasNext() ){
	            String key = (String)keys.next();
	            String value = jObject.getString(key); 
	            map.put(key, value);

	        }

	        System.out.println("json : "+jObject);
	        System.out.println("map : "+map);
			
		//	String token = this.getrNoteBookIntegrationService().saveRNotebookCredentials(notebookId, ecUser, new HashMap<String, String>());
	        String token = this.getrNoteBookIntegrationService().saveRNotebookCredentials(notebookId, ecUser, map);
			
			String guard = SystemProperties.getProperty("guard_notebook_url");
			
			retUrl = guard + "id=" + token;
			
		
		} catch (RNotebookIntegrationException re){
			return new ResponseEntity<String>(re.getMessage(), HttpStatus.BAD_REQUEST);
		} catch (Exception e){
			return new ResponseEntity<String>(e.getMessage(), HttpStatus.BAD_REQUEST);
		}
		
		return new ResponseEntity<String>(retUrl, HttpStatus.OK);
		
	}

}