Static error page

From: Lathish Date: Tue, 9 Feb 2021 10:41:21 +0000 (+0000) Subject: Fixed bugs in Gateway X-Git-Tag: 2.2.0~91 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=85132f5ec832e4d28a334a21a036e4b3a9ef7eca;p=portal%2Fnonrtric-controlpanel.git Fixed bugs in Gateway Updated the Proxy configuration in Frontend Updated the nginx conf Deleted the Web-backend project Issue-ID: NONRTRIC-434 Change-Id: Ie56759a35385b615fc7c5af18b154432f45c0d26 Signed-off-by: Lathish --- diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst index 51752b8..afe1a24 100644 --- a/docs/developer-guide.rst +++ b/docs/developer-guide.rst @@ -21,24 +21,23 @@ To run the Control Panel locally for development with simulated services, follow .. _gerrit: https://gerrit.o-ran-sc.org/r/admin/repos/portal/nonrtric-controlpanel -- Start the backend: - - cd webapp-backend - - mvn clean install - - mvn -Dorg.oransc.portal.nonrtric.controlpanel=mock -Dtest=MockControlPanelBackEnd -DfailIfNoTests=false test - - -- Now you can open URL: `localhost:8080`_ in a browser to access the backend directly. - -.. _localhost:8080: http://localhost:8080 - Start the frontend: cd webapp-frontend - - ./ng serve --proxy-config proxy.conf.json + + To start the frontend with Mock data: + + npm run start:mock + + To start the UI: + + You need to start the ControlPanel API Gateway, Policy Management Service & EI Service for the UI to list policy & EI information + + ./ng serve --proxy-config proxy.conf.json + + OR + + npm start - Now you can open URL: `localhost:4200`_ in a browser to access the Control Panel. diff --git a/nonrtric-gateway/Dockerfile b/nonrtric-gateway/Dockerfile index 9f2a545..f803a9c 100644 --- a/nonrtric-gateway/Dockerfile +++ b/nonrtric-gateway/Dockerfile @@ -24,7 +24,7 @@ ARG JAR WORKDIR /opt/app/nonrtric-gateway RUN mkdir -p /var/log/nonrtric-gateway -EXPOSE 8081 8433 +EXPOSE 9090 ADD /config/application.yaml /opt/app/nonrtric-gateway/config/application.yaml ADD target/${JAR} /opt/app/nonrtric-gateway/nonrtric-gateway.jar diff --git a/nonrtric-gateway/config/application.yaml b/nonrtric-gateway/config/application.yaml index cf3c358..98fd7d5 100644 --- a/nonrtric-gateway/config/application.yaml +++ b/nonrtric-gateway/config/application.yaml @@ -26,14 +26,14 @@ spring: httpserver: wiretap: true routes: - - id: policytypes + - id: A1-Policy uri: https://localhost:8433 predicates: - - Path=/a1-policy/v2/policy-types/** - - id: policies + - Path=/a1-policy/** + - id: A1-EI uri: https://localhost:8433 predicates: - - Path=/a1-policy/v2/policies/** + - Path=/ei-producer/** management: endpoint: gateway: diff --git a/pom.xml b/pom.xml deleted file mode 100644 index dccfe22..0000000 --- a/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - 4.0.0 - - - org.springframework.boot - spring-boot-starter-parent - 2.3.4.RELEASE - - - org.o-ran-sc.portal.nonrtric.controlpanel - nonrtric-controlpanel-parent - Non-RT RIC Control Panel project - pom - 2.2.0-SNAPSHOT - - 11 - 3.7.0.1746 - - - webapp-backend - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - ${sonar-maven-plugin.version} - - - - diff --git a/webapp-backend/.gitignore b/webapp-backend/.gitignore deleted file mode 100644 index f4a6f7b..0000000 --- a/webapp-backend/.gitignore +++ /dev/null @@ -1,34 +0,0 @@ -/.classpath -/.project -/.settings -/target/ -/logs/ -/.mvn/wrapper/maven-wrapper.jar -bin/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -/build/ - -/application-tlab2.properties -/application.properties -/controlpanel-users.json diff --git a/webapp-backend/README.md b/webapp-backend/README.md deleted file mode 100644 index acec8ac..0000000 --- a/webapp-backend/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Non-RT RIC Control Panel Web Application Backend - -The Non-RT RIC Control Panel back-end provides REST services to the Control Panel -front-end Typescript features running in the user's browser. For -production use, it also serves the Angular application files. - -Please see the documentation in the docs/ folder. - -The backend server publishes live API documentation at the -URL `http://your-host-name-here:8080/swagger-ui.html` - -## License - -Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. -Modifications Copyright (C) 2019 Nordix Foundation -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file 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. diff --git a/webapp-backend/eclipse-formatter.xml b/webapp-backend/eclipse-formatter.xml deleted file mode 100644 index 7339434..0000000 --- a/webapp-backend/eclipse-formatter.xml +++ /dev/null @@ -1,315 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml deleted file mode 100644 index d49b53b..0000000 --- a/webapp-backend/pom.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - 4.0.0 - - org.o-ran-sc.portal.nonrtric.controlpanel - nonrtric-controlpanel-parent - 2.2.0-SNAPSHOT - - nonrtric-controlpanel-be - Non-RT RIC Control Panel Webapp backend - - 2.6.0 - 2.9.2 - 2.7.1 - 1.7.9 - 2.8.1 - 1.18.0 - 0.8.5 - 0.33.0 - 20190722 - - 0 - - - - onap-releases - ONAP - Release Repository - https://nexus.onap.org/content/repositories/releases - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-webflux - - - org.slf4j - slf4j-api - - - org.apache.axis2 - axis2-kernel - ${apache-axis2.version} - - - org.projectlombok - lombok - provided - - - - org.slf4j - jcl-over-slf4j - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - io.springfox - springfox-swagger-ui - ${springfox.version} - - - org.immutables - value - ${immutable.version} - provided - - - org.immutables - gson - ${immutable.version} - - - org.json - json - ${json.version} - - - - - org.mockito - mockito-core - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.platform - junit-platform-launcher - test - - - io.projectreactor - reactor-test - test - - - com.squareup.okhttp3 - mockwebserver - test - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${project.build.directory}/generated-sources/annotations/ - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - net.revelc.code.formatter - formatter-maven-plugin - ${formatter-maven-plugin.version} - - ${project.basedir}/eclipse-formatter.xml - - - - - com.diffplug.spotless - spotless-maven-plugin - ${spotless-maven-plugin.version} - - - - - com,java,javax,org - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - - ${project.version}-b${build.number} - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - default-prepare-agent - - prepare-agent - - - - default-report - prepare-package - - report - - - - - - - io.fabric8 - docker-maven-plugin - ${docker-maven-plugin.version} - - true - - ${env.CONTAINER_PULL_REGISTRY} - ${env.CONTAINER_PUSH_REGISTRY} - - - - - o-ran-sc/nonrtric-controlpanel-backend:${project.version} - - openjdk:11-jre-slim - - - ${project.version} - - - artifact - - - - mkdir /logs - chmod -R 777 /logs - - - - - java - -Xms128m - -Xmx256m - -cp - maven:maven/${project.artifactId}-${project.version}.${project.packaging} - -Dloader.main=org.oransc.portal.nonrtric.controlpanel.ControlPanelApplication - -Djava.security.egd=file:/dev/./urandom - org.springframework.boot.loader.PropertiesLauncher - - - - - - - - - - - build - push - - - - - - - diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelApplication.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelApplication.java deleted file mode 100644 index 8f5befe..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelApplication.java +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ - -package org.oransc.portal.nonrtric.controlpanel; - -import java.lang.invoke.MethodHandles; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; - -@SpringBootApplication -// Limit scan to controlpanel classes; exclude generated API classes -@ComponentScan("org.oransc.portal.nonrtric.controlpanel") -public class ControlPanelApplication { - - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - public static void main(String[] args) { - SpringApplication.run(ControlPanelApplication.class); - // Ensure this appears on the console by using level WARN - logger.warn("main: version '{}' successful start", - getImplementationVersion(MethodHandles.lookup().lookupClass())); - } - - /** - * Gets version details for the specified class. - * - * @param clazz Class to get the version - * - * @return the value of the MANIFEST.MF property Implementation-Version as - * written by maven when packaged in a jar; 'unknown' otherwise. - */ - public static String getImplementationVersion(Class clazz) { - String classPath = clazz.getResource(clazz.getSimpleName() + ".class").toString(); - return classPath.startsWith("jar") ? clazz.getPackage().getImplementationVersion() : "unknown-not-jar"; - } - -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelConstants.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelConstants.java deleted file mode 100644 index b3766e8..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/ControlPanelConstants.java +++ /dev/null @@ -1,30 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel; - -public abstract class ControlPanelConstants { - - private ControlPanelConstants() { - // Sonar insists on hiding the constructor - } - - public static final String ENDPOINT_PREFIX = "/api"; -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SpringContextCache.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SpringContextCache.java deleted file mode 100644 index 5ceab55..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SpringContextCache.java +++ /dev/null @@ -1,44 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.config; - -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; - -/** - * Allows non-Spring-managed classes to obtain the Spring application context. - */ -@Component -public class SpringContextCache implements ApplicationContextAware { - - private ApplicationContext applicationContext = null; - - @Override - public void setApplicationContext(final ApplicationContext appContext) { - applicationContext = appContext; - } - - public ApplicationContext getApplicationContext() { - return applicationContext; - } - -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java deleted file mode 100644 index fa00b2f..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/SwaggerConfiguration.java +++ /dev/null @@ -1,69 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ - -package org.oransc.portal.nonrtric.controlpanel.config; - -import org.oransc.portal.nonrtric.controlpanel.ControlPanelApplication; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -/** - * http://www.baeldung.com/swagger-2-documentation-for-spring-rest-api - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfiguration { - - /** - * @return new Docket - */ - @Bean - public Docket api() { - return new Docket(DocumentationType.SWAGGER_2).select() // - .apis(RequestHandlerSelectors.basePackage(ControlPanelApplication.class.getPackage().getName())) // - .paths(PathSelectors.any()) // - .build() // - .apiInfo(apiInfo()); - } - - private ApiInfo apiInfo() { - final String version = ControlPanelApplication.class.getPackage().getImplementationVersion(); - return new ApiInfoBuilder() // - .title("Non-RT RIC Control Panel backend") // - .description("Proxies access to Near-RT RIC.")// - .termsOfServiceUrl("Terms of service") // - .contact(new Contact("Non-RT RIC Control Panel Dev Team", // - "http://no-docs-yet.org/", // - "noreply@O-RAN-SC.org")) // - .license("Apache 2.0 License").licenseUrl("http://www.apache.org/licenses/LICENSE-2.0") // - .version(version == null ? "version not available" : version) // - .build(); - } -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java deleted file mode 100644 index 150dc6b..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/config/TomcatWebServerConfiguration.java +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.config; - -import java.lang.invoke.MethodHandles; - -import org.apache.catalina.connector.Connector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; -import org.springframework.boot.web.servlet.server.ServletWebServerFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class TomcatWebServerConfiguration { - - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - @Value("${server.http.port}") - private int httpPort; - - @Bean - public ServletWebServerFactory servletContainer() { - logger.debug("Http Port: {}", httpPort); - TomcatServletWebServerFactory tomcat = new TomcatServletWebServerFactory(); - if (httpPort > 0) { - tomcat.addAdditionalTomcatConnectors(getHttpConnector(httpPort)); - } - return tomcat; - } - - private static Connector getHttpConnector(int port) { - Connector connector = new Connector(TomcatServletWebServerFactory.DEFAULT_PROTOCOL); - connector.setScheme("http"); - connector.setPort(port); - connector.setSecure(false); - return connector; - } - -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/CustomResponseEntityExceptionHandler.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/CustomResponseEntityExceptionHandler.java deleted file mode 100644 index 02ccae2..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/CustomResponseEntityExceptionHandler.java +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.controller; - -import java.lang.invoke.MethodHandles; - -import org.oransc.portal.nonrtric.controlpanel.model.ErrorTransport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.client.HttpStatusCodeException; -import org.springframework.web.client.RestClientResponseException; -import org.springframework.web.context.request.WebRequest; -import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; - -/** - * Catches certain exceptions. This controller advice factors out try-catch - * blocks in many controller methods. - * - * Also see:
- * https://www.baeldung.com/exception-handling-for-rest-with-spring - * https://www.springboottutorial.com/spring-boot-exception-handling-for-rest-services - */ -@ControllerAdvice -public class CustomResponseEntityExceptionHandler extends ResponseEntityExceptionHandler { - - // Superclass has "logger" that is exposed here, so use a different name - private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - /** - * Logs the error and generates a JSON response when a REST controller method - * takes a RestClientResponseException. This is thrown by the Http client when a - * remote method returns a non-2xx code. All the controller methods are proxies - * in that they just forward the request along to a remote system, so if that - * remote system fails, return 502 plus some details about the failure, rather - * than the generic 500 that Spring-Boot will return on an uncaught exception. - * - * Why 502? I quote:

HTTP server received an invalid response from a - * server it consulted when acting as a proxy or gateway.

- * - * @param ex - * The exception - * - * @param request - * The original request - * - * @return A response entity with status code 502 plus some details in the body. - */ - @ExceptionHandler({RestClientResponseException.class}) - public final ResponseEntity handleProxyMethodException(Exception ex, WebRequest request) { - // Capture the full stack trace in the log. - log.error("handleProxyMethodException: request {}, exception {}", request.getDescription(false), - ex.getMessage()); - if (ex instanceof HttpStatusCodeException) { - HttpStatusCodeException hsce = (HttpStatusCodeException) ex; - return new ResponseEntity<>(new ErrorTransport(hsce.getRawStatusCode(), hsce.getResponseBodyAsString(), - ex.toString(), request.getDescription(false)), HttpStatus.BAD_GATEWAY); - } else { - return new ResponseEntity<>(new ErrorTransport(500, ex), HttpStatus.BAD_GATEWAY); - } - } - -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java deleted file mode 100644 index 297f5bc..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/EnrichmentController.java +++ /dev/null @@ -1,139 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.controller; - -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; - -import io.swagger.annotations.ApiOperation; - -import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.List; - -import org.oransc.portal.nonrtric.controlpanel.ControlPanelConstants; -import org.oransc.portal.nonrtric.controlpanel.eiproducerapi.EiProducerApi; -import org.oransc.portal.nonrtric.controlpanel.model.JobInfo; -import org.oransc.portal.nonrtric.controlpanel.model.ProducerInfo; -import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo; -import org.oransc.portal.nonrtric.controlpanel.model.ProducerRegistrationInfo.ProducerEiTypeRegistrationInfo; -import org.oransc.portal.nonrtric.controlpanel.model.ProducerStatusInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Proxies calls from the front end to the EI Producer API. - * - * If a method throws RestClientResponseException, it is handled by - * {@link CustomResponseEntityExceptionHandler#handleProxyMethodException(Exception, org.springframework.web.context.request.WebRequest)} - * which returns status 502. All other exceptions are handled by Spring which - * returns status 500. - */ -@RestController -@RequestMapping(value = EnrichmentController.CONTROLLER_PATH, produces = MediaType.APPLICATION_JSON_VALUE) -public class EnrichmentController { - - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - // Publish paths in constants so tests are easy to write - public static final String CONTROLLER_PATH = ControlPanelConstants.ENDPOINT_PREFIX + "/enrichment"; - // Endpoints - public static final String EI_TYPES = "eitypes"; - public static final String EI_PRODUCERS = "eiproducers"; - public static final String EI_JOBS = "eijobs"; - public static final String EI_TYPE_ID = "ei_type_id"; - public static final String EI_PRODUCER_ID = "ei_producer_id"; - public static final String STATUS = "status"; - - // Populated by the autowired constructor - private final EiProducerApi eiProducerApi; - public static com.google.gson.Gson gson = new GsonBuilder().create(); - - @Autowired - public EnrichmentController(final EiProducerApi eiProducerApi) { - Assert.notNull(eiProducerApi, "API must not be null"); - this.eiProducerApi = eiProducerApi; - logger.debug("enrichment: configured with client type {}", eiProducerApi.getClass().getName()); - } - - @ApiOperation(value = "Get the EI job definitions for one EI producer") - @GetMapping(EI_JOBS) - public ResponseEntity getEiJobs() { - logger.debug("getEiJobs"); - ResponseEntity response = this.eiProducerApi.getAllEiProducerIds(); - JsonArray bodyJson = JsonParser.parseString(response.getBody()).getAsJsonArray(); - List allJobs = new ArrayList<>(); - for (JsonElement producerId : bodyJson) { - allJobs.addAll(getJobs(producerId)); - } - return new ResponseEntity<>(gson.toJson(allJobs), HttpStatus.OK); - } - - private List getJobs(JsonElement producerId) { - ResponseEntity> jobsResponse = - this.eiProducerApi.getEiJobsForOneEiProducer(producerId.getAsString()); - return jobsResponse.getBody(); - } - - @ApiOperation(value = "Get EI producers") - @GetMapping(EI_PRODUCERS) - public ResponseEntity getEiProducers() { - logger.debug("getEiProducers"); - ResponseEntity response = this.eiProducerApi.getAllEiProducerIds(); - JsonArray bodyJson = JsonParser.parseString(response.getBody()).getAsJsonArray(); - List producers = new ArrayList<>(); - for (JsonElement producerId : bodyJson) { - ProducerInfo producerInfo = ProducerInfo.builder() // - .id(producerId.getAsString()) // - .types(getSupportedTypes(producerId)) // - .status(getProducerStatus(producerId)) // - .build(); - producers.add(producerInfo); - } - - return new ResponseEntity<>(gson.toJson(producers), HttpStatus.OK); - } - - private String[] getSupportedTypes(JsonElement producerId) { - ResponseEntity producerResponse = - this.eiProducerApi.getEiProducer(producerId.getAsString()); - List supportedTypes = new ArrayList<>(); - for (ProducerEiTypeRegistrationInfo type : producerResponse.getBody().types) { - supportedTypes.add(type.eiTypeId); - } - return supportedTypes.toArray(new String[0]); - } - - private String getProducerStatus(JsonElement producerId) { - ResponseEntity statusResponse = - this.eiProducerApi.getEiProducerStatus(producerId.getAsString()); - return statusResponse.getBody().opState.toString(); - } -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/Html5PathsController.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/Html5PathsController.java deleted file mode 100644 index 1ed6d0a..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/Html5PathsController.java +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 AT&T Intellectual Property - * Modifications Copyright (C) 2019 Nordix Foundation - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.controller; - -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.net.URL; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * Listens for requests to known Angular routes. - */ -@Controller -public class Html5PathsController { - - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - /** - * Forwards the browser to the index (main) page upon request of a known route. - * This unfortunately requires duplication of the Angular route strings in the - * path mappings on this method. Could switch to a regex pattern instead someday - * if the routes change too often. - * - * https://stackoverflow.com/questions/44692781/configure-spring-boot-to-redirect-404-to-a-single-page-app - * - * @param request - * HttpServletRequest - * @param response - * HttpServletResponse - * @throws IOException - * On error - */ - @GetMapping("/policy") - public void forwardAngularRoutes(HttpServletRequest request, HttpServletResponse response) throws IOException { - URL url = new URL(request.getScheme(), request.getServerName(), request.getServerPort(), "/index.html"); - if (logger.isDebugEnabled()) - logger.debug("forwardAngularRoutes: {} redirected to {}", request.getRequestURI(), url); - response.sendRedirect(url.toString()); - } - -} diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/PolicyController.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/PolicyController.java deleted file mode 100644 index ccc2ac7..0000000 --- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/controller/PolicyController.java +++ /dev/null @@ -1,132 +0,0 @@ -/*- - * ========================LICENSE_START================================= - * O-RAN-SC - * %% - * Copyright (C) 2019 Nordix Foundation - * Modifications Copyright (C) 2020 Nordix Foundation - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file 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. - * ========================LICENSE_END=================================== - */ -package org.oransc.portal.nonrtric.controlpanel.controller; - -import io.swagger.annotations.ApiOperation; - -import java.lang.invoke.MethodHandles; - -import javax.servlet.http.HttpServletResponse; - -import org.oransc.portal.nonrtric.controlpanel.ControlPanelConstants; -import org.oransc.portal.nonrtric.controlpanel.policyagentapi.PolicyAgentApi; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -/** - * Proxies calls from the front end to the Policy Agent API. - * - * If a method throws RestClientResponseException, it is handled by - * {@link CustomResponseEntityExceptionHandler#handleProxyMethodException(Exception, org.springframework.web.context.request.WebRequest)} - * which returns status 502. All other exceptions are handled by Spring which - * returns status 500. - */ -@RestController -@RequestMapping(value = PolicyController.CONTROLLER_PATH, produces = MediaType.APPLICATION_JSON_VALUE) -public class PolicyController { - - private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - - // Publish paths in constants so tests are easy to write - public static final String CONTROLLER_PATH = ControlPanelConstants.ENDPOINT_PREFIX + "/policy"; - // Endpoints - public static final String POLICY_TYPES_METHOD = "policytypes"; - public static final String POLICY_TYPE_PARAM = "type"; - public static final String POLICIES_NAME = "policies"; - public static final String POLICY_INSTANCE_ID_NAME = "policy_instance_id"; - - // Populated by the autowired constructor - private final PolicyAgentApi policyAgentApi; - - @Autowired - public PolicyController(final PolicyAgentApi policyAgentApi) { - Assert.notNull(policyAgentApi, "API must not be null"); - this.policyAgentApi = policyAgentApi; - logger.debug("ctor: configured with client type {}", policyAgentApi.getClass().getName()); - } - - /* - * The fields are defined in the Policy Control Typescript interface. - */ - @ApiOperation(value = "Gets the policy types from Near-RT RIC") - @GetMapping(POLICY_TYPES_METHOD) - public ResponseEntity getAllPolicyTypes(HttpServletResponse response) { - logger.debug("getAllPolicyTypes"); - return this.policyAgentApi.getAllPolicyTypes(); - } - - @ApiOperation(value = "Returns the policy instances for the given policy type.") - @GetMapping(POLICIES_NAME) - public ResponseEntity getPolicyInstances( - @RequestParam(name = "type", required = true) String policyTypeIdString) { - logger.debug("getPolicyInstances {}", policyTypeIdString); - return this.policyAgentApi.getPolicyInstancesForType(policyTypeIdString); - } - - @ApiOperation(value = "Returns a policy instance") - @GetMapping(POLICIES_NAME + "/{" + POLICY_INSTANCE_ID_NAME + "}") - public ResponseEntity

Non-RT RIC Control Panel Error

The previous request could not be processed.