diff --git a/.travis.yml b/.travis.yml index eee5cbd8..3a3b3f71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ before_install: - sudo apt-get install -y pylint script: - - ./run_ci_build.sh +# - ./run_ci_build.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e1945464..adcdc555 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ The Technical Steering Committee roles include: * Any new project repositories must be approved by the Technical Steering Committee. ## Submitting Changes -Inbound contributions are done through [pull requests](https://github.com/open-ness/edgeapps/pulls) which include code changes, enhancements, bug fixes or new applications/features. If you are getting started, you may refer to Github's [how-to](https://help.github.com/articles/using-pull-requests/). With your contributions, we expect that you: +Inbound contributions are done through [pull requests](https://github.com/smart-edge-open/edgeapps/pulls) which include code changes, enhancements, bug fixes or new applications/features. If you are getting started, you may refer to Github's [how-to](https://help.github.com/articles/using-pull-requests/). With your contributions, we expect that you: * certify that you wrote and/or have the right to submit the pull request, * agree with the [Developer Certificate of Origin](http://developercertificate.org/), @@ -71,18 +71,18 @@ Big contributions, ideas or controversial features should be discussed with the 6. Merging the pull requests can only be performed by the maintainer(s). ## How to report an issue/bug/enhancement -It is encouraged to use the [GitHub Issues](https://github.com/open-ness/edgeapps/issues) tool to report any bug, issue, enhancement or to seek help. +It is encouraged to use the [GitHub Issues](https://github.com/smart-edge-open/edgeapps/issues) tool to report any bug, issue, enhancement or to seek help. ## Resources Below are some useful resources for getting started with OpenNESS: -* [OpenNESS release notes](https://github.com/open-ness/specs/blob/master/openness_releasenotes.md) -* [OpenNESS solution index](https://github.com/open-ness/specs/blob/master/README.md) -* [OpenNESS architecture and solution overview](https://github.com/open-ness/specs/blob/master/doc/architecture.md) -* [OpenNESS getting started guide — network edge](https://github.com/open-ness/specs/blob/master/doc/getting-started/network-edge/controller-edge-node-setup.md) -* [OpenNESS getting started guide — on-premises](https://github.com/open-ness/specs/blob/master/doc/getting-started/on-premises/controller-edge-node-setup.md) -* [OpenNESS application onboarding — network edge](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md) -* [OpenNESS application onboarding — on-premises](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/on-premises-applications-onboarding.md) -* [OpenNESS application development and porting guide](https://github.com/open-ness/specs/blob/master/doc/applications/openness_appguide.md) +* [OpenNESS release notes](https://github.com/smart-edge-open/specs/blob/master/openness_releasenotes.md) +* [OpenNESS solution index](https://github.com/smart-edge-open/specs/blob/master/README.md) +* [OpenNESS architecture and solution overview](https://github.com/smart-edge-open/specs/blob/master/doc/architecture.md) +* [OpenNESS getting started guide — network edge](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/network-edge/controller-edge-node-setup.md) +* [OpenNESS getting started guide — on-premises](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/on-premises/controller-edge-node-setup.md) +* [OpenNESS application onboarding — network edge](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md) +* [OpenNESS application onboarding — on-premises](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/on-premises-applications-onboarding.md) +* [OpenNESS application development and porting guide](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_appguide.md) ## Style Guide / Coding conventions All contributions must follow the [Development Guide](DEVELOPING.md). diff --git a/README.md b/README.md index b5f8e118..2039381e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.com/open-ness/edgeapps.svg?branch=master)](https://travis-ci.com/open-ness/edgeapps) -[![Go Report Card](https://goreportcard.com/badge/github.com/open-ness/edgeapps)](https://goreportcard.com/report/github.com/open-ness/edgeapps) +[![Build Status](https://travis-ci.com/smart-edge-open/edgeapps.svg?branch=master)](https://travis-ci.com/smart-edge-open/edgeapps) +[![Go Report Card](https://goreportcard.com/badge/github.com/smart-edge-open/edgeapps)](https://goreportcard.com/report/github.com/smart-edge-open/edgeapps) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE) # OpenNESS Edge Applications @@ -7,13 +7,13 @@ This repository presents reference designs of network & enterprise edge applicat ## Getting Started -If this is your first stop at OpenNESS project, feel free to familiarize yourself with [OpenNESS philosophy and architecture](https://github.com/open-ness/specs/blob/master/doc/architecture.md) and have a look at the [release notes](https://github.com/open-ness/specs/blob/master/openness_releasenotes.md) to learn about the release history, fixed issues and compatible software/hardware. +If this is your first stop at OpenNESS project, feel free to familiarize yourself with [OpenNESS philosophy and architecture](https://github.com/smart-edge-open/specs/blob/master/doc/architecture.md) and have a look at the [release notes](https://github.com/smart-edge-open/specs/blob/master/openness_releasenotes.md) to learn about the release history, fixed issues and compatible software/hardware. -To get started with OpenNESS installation, follow the steps in [the network edge getting started guide](https://github.com/open-ness/specs/blob/master/doc/getting-started/network-edge/controller-edge-node-setup.md) or [the on-premises getting started guide](https://github.com/open-ness/specs/blob/master/doc/getting-started/on-premises/controller-edge-node-setup.md) according to the desired deployment type. More information about the difference between the two deployment scenarios is provided in the [Deployment Scenarios](https://github.com/open-ness/specs/blob/master/doc/architecture.md#deployment-scenarios) section. +To get started with OpenNESS installation, follow the steps in [the network edge getting started guide](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/network-edge/controller-edge-node-setup.md) or [the on-premises getting started guide](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/on-premises/controller-edge-node-setup.md) according to the desired deployment type. More information about the difference between the two deployment scenarios is provided in the [Deployment Scenarios](https://github.com/smart-edge-open/specs/blob/master/doc/architecture.md#deployment-scenarios) section. -The edge applications provided in this repository are landed on OpenNESS which is described in the onboarding guides for [network edge deployment](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md) and [on-premises deployment](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/on-premises-applications-onboarding.md). It is advised that you practice with these onboarding guides in order to get a feel of how the edge apps are launched and operated in the OpenNESS environment. +The edge applications provided in this repository are landed on OpenNESS which is described in the onboarding guides for [network edge deployment](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md) and [on-premises deployment](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/on-premises-applications-onboarding.md). It is advised that you practice with these onboarding guides in order to get a feel of how the edge apps are launched and operated in the OpenNESS environment. -The full documentation of the OpenNESS solution is accessible at the [OpenNESS index page](https://github.com/open-ness/specs/blob/master/README.md). +The full documentation of the OpenNESS solution is accessible at the [OpenNESS index page](https://github.com/smart-edge-open/specs/blob/master/README.md). ## Contributing diff --git a/applications/cdn-caching/nginx/README.md b/applications/cdn-caching/nginx/README.md index 000d8b77..1d8e7c54 100644 --- a/applications/cdn-caching/nginx/README.md +++ b/applications/cdn-caching/nginx/README.md @@ -86,7 +86,7 @@ Extra setup is not required when using the control interface for data / content #### Setting up the SR-IOV interface -1. Please refer to the link for setting up the SR-IOV interface: [Setting up SR-IOV for network edge](https://github.com/open-ness/specs/blob/master/doc/building-blocks/enhanced-platform-awareness/openness-sriov-multiple-interfaces.md#sriov-for-network-edge) +1. Please refer to the link for setting up the SR-IOV interface: [Setting up SR-IOV for network edge](https://github.com/smart-edge-open/specs/blob/master/doc/building-blocks/enhanced-platform-awareness/openness-sriov-multiple-interfaces.md#sriov-for-network-edge) 2. Set the "sriov" helm key to "True" to enable the sriov annotations and NFD features in the deployment specification. diff --git a/applications/eis-experience-kit/docs/whitepaper.md b/applications/eis-experience-kit/docs/whitepaper.md index 5048a0a4..d0eab0ea 100644 --- a/applications/eis-experience-kit/docs/whitepaper.md +++ b/applications/eis-experience-kit/docs/whitepaper.md @@ -112,7 +112,7 @@ The EII application can be deployed through the OpenNESS architecture which requ - **Camera**: A set of cameras connected through the wireless network. -EII installation and deployment on the OpenNESS Network Edge environment is available at [eis-experience-kit](https://github.com/open-ness/edgeapps/blob/master/applications/eis-experience-kit/README.md) +EII installation and deployment on the OpenNESS Network Edge environment is available at [eis-experience-kit](https://github.com/smart-edge-open/edgeapps/blob/master/applications/eis-experience-kit/README.md) *NOTE: `In the above diagram, the RTSP Camera Stream pod is used for sending the RTSP stream. But in LTE/5G Network real-time deployment, the camera stream will come from real IP camera as per below diagram`* @@ -145,6 +145,6 @@ With a Cloud Native approach, the EII application can be deployed on multiple no The PCB demo sample application when deployed on OpenNESS creates an impactful edge computing use case that utilizes the capability of OpenNESS and EII. ## Reference -- [OpenNESS Architecture]( https://github.com/open-ness/specs/blob/master/doc/architecture.md) +- [OpenNESS Architecture]( https://github.com/smart-edge-open/specs/blob/master/doc/architecture.md) - [Intel’s Edge Insights for Industrial](https://www.intel.com/content/www/us/en/internet-of-things/industrial-iot/edge-insights-industrial.html) diff --git a/applications/openvino/README.md b/applications/openvino/README.md index 4c08ac8a..24e87ac0 100644 --- a/applications/openvino/README.md +++ b/applications/openvino/README.md @@ -8,8 +8,8 @@ Copyright (c) 2020 Intel Corporation ### Overview This sample application demonstrates OpenVINO object detection (pedestrian and vehicle detection) deployment and execution on the OpenNESS edge platform. -- [OpenVINO Sample Application White Paper](https://github.com/open-ness/specs/blob/master/doc/applications/openness_openvino.md) -- [OpenVINO Sample Application Onboarding Guide - Network Edge](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-openvino-application) +- [OpenVINO Sample Application White Paper](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_openvino.md) +- [OpenVINO Sample Application Onboarding Guide - Network Edge](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-openvino-application) ### Troubleshooting diff --git a/applications/openvino/benchmark/README.md b/applications/openvino/benchmark/README.md index 391ab86b..5c8de577 100644 --- a/applications/openvino/benchmark/README.md +++ b/applications/openvino/benchmark/README.md @@ -5,7 +5,7 @@ Copyright (c) 2020 Intel Corporation # OpenVINO Benchmark Performance Test -> Notes: The following all steps assumes that OpenNESS were installed through [OpenNESS playbooks](https://github.com/open-ness/specs/blob/master/doc/getting-started/openness-cluster-setup.md). +> Notes: The following all steps assumes that OpenNESS were installed through [OpenNESS playbooks](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/openness-cluster-setup.md). - [Precondition](#precondition) - [Build benchamrk image](#build-benchamrk-image) diff --git a/applications/openvino/clientsim/Dockerfile b/applications/openvino/clientsim/Dockerfile index 1a9288ec..7f99071b 100644 --- a/applications/openvino/clientsim/Dockerfile +++ b/applications/openvino/clientsim/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && \ apt-get -y install sudo && \ apt-get -y install unzip && \ apt-get -y install wget && \ + apt-get -y install curl && \ apt-get -y install lsb-core && \ apt-get -y install autoconf libtool && \ apt-get -y install ffmpeg x264 && \ diff --git a/applications/openvino/consumer/Dockerfile.pwek b/applications/openvino/consumer/Dockerfile.pwek new file mode 100644 index 00000000..b7e18ab0 --- /dev/null +++ b/applications/openvino/consumer/Dockerfile.pwek @@ -0,0 +1,149 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) 2019 Intel Corporation + +FROM ubuntu:20.04 + +ENV http_proxy=$http_proxy +ENV https_proxy=$https_proxy +ENV no_proxy=$no_proxy,eaa.openness,analytics.openness +ENV DEBIAN_FRONTEND=noninteractive + +## OnPrem NTS uses CPU 0,2 and 3. +## So OpenVINO user needs to configure the value according the setup +ENV OPENVINO_TASKSET_CPU=75 + +ARG OPENVINO_LINK=https://registrationcenter-download.intel.com/akdlm/irc_nas/17062/l_openvino_toolkit_p_2021.1.110.tgz +ARG YEAR=2021 +ARG OPENVINO_DEMOS_DIR=/opt/intel/openvino_$YEAR/deployment_tools/open_model_zoo/demos +ARG MODEL_ROOT=/opt/intel/openvino_$YEAR/deployment_tools/open_model_zoo/tools/downloader +ARG NGINX_VERSION=1.21.1 +ARG NGINX_RTMP_MODULE_VERSION=1.2.2 +ENV APP_DIR=/opt/intel/openvino_$YEAR/deployment_tools/inference_engine/demos/python_demos/object_detection_demo_ssd_async/ + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt update -y +RUN apt install -y curl \ + unzip \ + python3-pip \ + git + +RUN apt clean all + +# OpenVino installation +RUN cd /tmp && \ + curl -O -L $OPENVINO_LINK && \ + tar xf l_openvino_toolkit*.tgz && \ + cd l_openvino_toolkit* && \ + sed -i 's/decline/accept/g' silent.cfg && \ + ./install_openvino_dependencies.sh && \ + ./install.sh -s silent.cfg && \ + rm -rf /tmp/l_openvino_toolkit* + +# Install numpy +RUN pip3 install numpy + +# Rebuilding libusb without UDEV support -- required for Intel Movidius Stick +RUN cd /tmp && \ + curl -O -L https://github.com/libusb/libusb/archive/v1.0.22.zip && \ + unzip v1.0.22.zip && cd libusb-1.0.22 && \ + ./bootstrap.sh && \ + ./configure --disable-udev --enable-shared && \ + make -j4 && make install && \ + rm -rf /tmp/*1.0.22* + +# Build Nginx +# Install dependencies +RUN apt-get update && \ + apt-get install -y \ + ca-certificates \ + openssl libssl-dev yasm \ + libpcre3-dev librtmp-dev libtheora-dev \ + libvorbis-dev libvpx-dev libfreetype6-dev \ + libmp3lame-dev libx264-dev libx265-dev && \ + rm -rf /var/lib/apt/lists/* + +# Download nginx source +RUN mkdir -p /tmp/build && \ + cd /tmp/build && \ + curl -O -L https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \ + tar -zxf nginx-${NGINX_VERSION}.tar.gz && \ + rm nginx-${NGINX_VERSION}.tar.gz + +# Download rtmp-module source +RUN cd /tmp/build && \ + curl -O -L https://github.com/arut/nginx-rtmp-module/archive/v${NGINX_RTMP_MODULE_VERSION}.tar.gz && \ + tar -zxf v${NGINX_RTMP_MODULE_VERSION}.tar.gz && \ + rm v${NGINX_RTMP_MODULE_VERSION}.tar.gz + +# Build nginx with nginx-rtmp module +RUN cd /tmp/build/nginx-${NGINX_VERSION} && \ + ./configure \ + --sbin-path=/usr/local/sbin/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --error-log-path=/var/log/nginx/error.log \ + --http-log-path=/var/log/nginx/access.log \ + --pid-path=/var/run/nginx/nginx.pid \ + --lock-path=/var/lock/nginx.lock \ + --http-client-body-temp-path=/tmp/nginx-client-body \ + --with-http_ssl_module \ + --with-threads \ + --add-module=/tmp/build/nginx-rtmp-module-${NGINX_RTMP_MODULE_VERSION} && \ + make -j 2 && \ + make install + +COPY nginx.conf /etc/nginx/nginx.conf +RUN chmod +s /usr/local/sbin/nginx + +# Creating user openvino and adding it to groups "video" and "users" to use GPU and VPU +RUN useradd -ms /bin/bash -G video,users,www-data openvino && \ + chown -R openvino /home/openvino + +COPY cmd/ /home/openvino +ADD start.sh.pwek /home/openvino/start.sh + +RUN chown -R openvino:openvino /opt/intel/openvino* +RUN chown -R openvino:openvino /home/openvino/* + +RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ + ln -sf /dev/stderr /var/log/nginx/error.log + +USER openvino +RUN echo "source /opt/intel/openvino_$YEAR/bin/setupvars.sh" >> ~/.bashrc +RUN bash -c "source ~/.bashrc" + +# Build OpenVINO samples +ADD object_detection_demo_ssd_async.patch $APP_DIR +RUN cd $APP_DIR && patch -p0 object_detection_demo_ssd_async.py object_detection_demo_ssd_async.patch + +# Download OpenVINO pre-trained models +RUN cd $MODEL_ROOT && python3 -mpip install --user -r ./requirements.in && \ + ./downloader.py --name pedestrian-detection-adas-0002 && \ + ./downloader.py --name vehicle-detection-adas-0002 + +RUN cp -r $MODEL_ROOT/intel/vehicle-detection-adas-0002 $APP_DIR/ && \ + cp -r $MODEL_ROOT/intel/pedestrian-detection-adas-0002 $APP_DIR/ + +# Install Go +RUN cd /tmp && \ + curl -O -L https://dl.google.com/go/go1.15.linux-amd64.tar.gz && \ + tar -xvf go1.15.linux-amd64.tar.gz + +ENV OPENVINO_ROOT=/opt/intel/openvino_$YEAR +ENV GOPATH=/home/openvino/go +ENV GOROOT=/tmp/go +ENV GO111MODULE=on +ENV PATH=$GOPATH/bin:$GOROOT/bin:$PATH +RUN mkdir $GOPATH + +# Work Dir +WORKDIR /home/openvino +ADD output_320x240.mp4 ./ + +# Get go dependencies +RUN git config --global http.proxy $http_proxy +RUN go get github.com/gorilla/websocket +RUN go build main.go openvino.go eaa_interface.go + +# OpenVINO inference and forwarding +ENTRYPOINT ["./start.sh"] diff --git a/applications/openvino/consumer/build-image.sh b/applications/openvino/consumer/build-image.sh index 80fb51e1..378e889e 100755 --- a/applications/openvino/consumer/build-image.sh +++ b/applications/openvino/consumer/build-image.sh @@ -2,10 +2,18 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) 2019 Intel Corporation - declare http_proxy https_proxy no_proxy -sudo docker build \ + +if [ -z "$1" ];then + sudo docker build \ + --build-arg http_proxy="$http_proxy" \ + --build-arg https_proxy="$https_proxy" \ + --build-arg no_proxy="$no_proxy" \ + -t openvino-cons-app:1.0 -f Dockerfile . +else + sudo docker build \ --build-arg http_proxy="$http_proxy" \ --build-arg https_proxy="$https_proxy" \ --build-arg no_proxy="$no_proxy" \ - -t openvino-cons-app:1.0 . + -t openvino-cons-app:1.0 -f Dockerfile.pwek . +fi diff --git a/applications/openvino/consumer/cmd/go.mod b/applications/openvino/consumer/cmd/go.mod index ae174541..0f8ce7bf 100644 --- a/applications/openvino/consumer/cmd/go.mod +++ b/applications/openvino/consumer/cmd/go.mod @@ -1,4 +1,4 @@ -module github.com/open-ness/edgeapps/applications/openvino/consumer +module github.com/smart-edge-open/edgeapps/applications/openvino/consumer go 1.16 diff --git a/applications/openvino/consumer/cmd/main.go b/applications/openvino/consumer/cmd/main.go index 74c0efb0..bfa98854 100644 --- a/applications/openvino/consumer/cmd/main.go +++ b/applications/openvino/consumer/cmd/main.go @@ -28,6 +28,7 @@ const ( ) var myURN URN +var cpuSet string // InferenceSettings is the notification structure of OpenVINO inference // settings: model name & acceleration type @@ -257,7 +258,7 @@ func switchModel(payload []byte) { infSettings.Accelerator) // Call OpenVINO C++ App with the model name & acceleration type - callOpenVINO(infSettings.Model, infSettings.Accelerator) + callOpenVINO(infSettings.Model, infSettings.Accelerator, cpuSet) } func notifListener(conn *websocket.Conn, client *http.Client) { @@ -304,8 +305,11 @@ func notifListener(conn *websocket.Conn, client *http.Client) { } func main() { + if len(os.Args) < 2 { + log.Fatal("Usage help: ./main \nFor example: ./main 8") + } log.Println("OpenVINO Consumer Started") - + cpuSet = os.Args[1] myURN = URN{ ID: "consumer", Namespace: "openvino", diff --git a/applications/openvino/consumer/cmd/openvino.go b/applications/openvino/consumer/cmd/openvino.go index 9826f783..b2aa36e4 100644 --- a/applications/openvino/consumer/cmd/openvino.go +++ b/applications/openvino/consumer/cmd/openvino.go @@ -8,6 +8,7 @@ import ( "log" "os" "os/exec" + "strconv" "strings" ) @@ -20,7 +21,15 @@ const ( var cmd *exec.Cmd -func callOpenVINO(model string, accl string) { +func checkEnvVariable(number string) { + + _, err := strconv.Atoi(number) + if err != nil { + log.Fatal("The invalid environment variable: OPENVINO_TASKSET_CPU") + } +} + +func callOpenVINO(model string, accl string, cpuset string) { var modelXML string // validate accelerator type @@ -46,14 +55,13 @@ func callOpenVINO(model string, accl string) { openvinoPath := os.Getenv("APP_DIR") openvinoCmd := "object_detection_demo_ssd_async.py" - // get taskset cpu from env - openvinoTasksetCPU := os.Getenv("OPENVINO_TASKSET_CPU") + checkEnvVariable(cpuset) if err := os.Chdir(openvinoPath); err != nil { log.Fatal("Failed to change directory:", err) } - cmd = exec.Command("taskset", "-c", openvinoTasksetCPU, + cmd = exec.Command("taskset", "-c", cpuset, "python3", openvinoCmd, "-d", accl, "-i", "rtmp://127.0.0.1:5000/live/test.flv", "-m", modelXML) diff --git a/applications/openvino/consumer/nginx.conf b/applications/openvino/consumer/nginx.conf index e42a6f99..f4acc29b 100644 --- a/applications/openvino/consumer/nginx.conf +++ b/applications/openvino/consumer/nginx.conf @@ -2,9 +2,7 @@ # Copyright (c) 2019 Intel Corporation user www-data; -#worker_processes 1; -pid /run/nginx.pid; -include /etc/nginx/modules-enabled/*.conf; +worker_processes auto; events { worker_connections 768; diff --git a/applications/openvino/consumer/openvino-cons-app.yaml b/applications/openvino/consumer/openvino-cons-kubeovn-app.yaml similarity index 100% rename from applications/openvino/consumer/openvino-cons-app.yaml rename to applications/openvino/consumer/openvino-cons-kubeovn-app.yaml diff --git a/applications/openvino/consumer/openvino-cons-sriov-app.yaml b/applications/openvino/consumer/openvino-cons-sriov-app.yaml new file mode 100644 index 00000000..1d12150f --- /dev/null +++ b/applications/openvino/consumer/openvino-cons-sriov-app.yaml @@ -0,0 +1,152 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) 2019 Intel Corporation + +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: openvino-cons-app + +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: openvino-cons-app-csr-requester +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: csr-requester +subjects: + - kind: ServiceAccount + name: openvino-cons-app + namespace: default + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: openvino-cons-app-csr-config +data: + certrequest.json: | + { + "CSR": { + "Name": "openvino-cons-app", + "Subject": { + "CommonName": "openvino:consumer", + "Organization": ["Intel Corporation"] + }, + "DNSSANs": [], + "IPSANs": [], + "KeyUsages": [ + "digital signature", "key encipherment", "client auth" + ] + }, + "Signer": "openness.org/certsigner", + "WaitTimeout": "5m" + } +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: openvino-cons-app +spec: + replicas: 1 + selector: + matchLabels: + app: openvino-cons-app + template: + metadata: + labels: + app: openvino-cons-app + annotations: + k8s.v1.cni.cncf.io/networks: sriov-openvino + spec: + serviceAccountName: openvino-cons-app + initContainers: + - name: alpine + image: alpine:3.12.0 + command: ["/bin/sh"] + args: + - "-c" + - "cp /ca-certrequester/cert.pem /root/certs/root.pem" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: "0.1" + limits: + cpu: "0.1" + memory: "128Mi" + volumeMounts: + - name: ca-certrequester + mountPath: /ca-certrequester + - name: certs + mountPath: /root/certs + - name: certrequester + image: certrequester:1.0 + imagePullPolicy: IfNotPresent + args: ["--cfg", "/home/certrequester/config/certrequest.json"] + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: "0.1" + limits: + cpu: "0.1" + memory: "128Mi" + volumeMounts: + - name: config + mountPath: /home/certrequester/config + - name: certs + mountPath: /home/certrequester/certs + - name: alpine2 + image: alpine:3.12.0 + command: ["/bin/sh"] + args: + - "-c" + - "chmod -R 0777 /root/certs" + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: "0.1" + limits: + cpu: "0.1" + memory: "128Mi" + volumeMounts: + - name: certs + mountPath: /root/certs + containers: + - name: openvino-cons-app + image: openvino-cons-app:1.0 + imagePullPolicy: IfNotPresent + ports: + - containerPort: 443 + - containerPort: 5000 + protocol: TCP + volumeMounts: + - name: certs + mountPath: /home/openvino/certs + - name: tmp + mountPath: /var/tmp + - name: shm + mountPath: /dev/shm + resources: + requests: + intel.com/intel_sriov_10G_VEDIOSTREAM: '1' + limits: + intel.com/intel_sriov_10G_VEDIOSTREAM: '1' + volumes: + - name: config + configMap: + name: openvino-cons-app-csr-config + - name: ca-certrequester + secret: + secretName: ca-certrequester + - name: certs + emptyDir: {} + - name: tmp + hostPath: + path: /var/tmp + type: Directory + - name: shm + hostPath: + path: /dev/shm + type: Directory diff --git a/applications/openvino/consumer/output_320x240.mp4 b/applications/openvino/consumer/output_320x240.mp4 new file mode 100644 index 00000000..2ad68010 Binary files /dev/null and b/applications/openvino/consumer/output_320x240.mp4 differ diff --git a/applications/openvino/consumer/sriov_crd.yaml b/applications/openvino/consumer/sriov_crd.yaml new file mode 100644 index 00000000..68df57c2 --- /dev/null +++ b/applications/openvino/consumer/sriov_crd.yaml @@ -0,0 +1,20 @@ +apiVersion: "k8s.cni.cncf.io/v1" +kind: NetworkAttachmentDefinition +metadata: + name: sriov-net-openvino + annotations: + k8s.v1.cni.cncf.io/resourceName: intel.com/intel_sriov_10G_VEDIOSTREAM +spec: + config: '{ + "type": "sriov", + "cniVersion": "0.3.1", + "name": "sriov-network", + "ipam": { + "type": "host-local", + "subnet": "192.168.2.0/24", + "routes": [{ + "dst": "0.0.0.0/0" + }], + "gateway": "192.168.2.1" + } +}' diff --git a/applications/openvino/consumer/start.sh.pwek b/applications/openvino/consumer/start.sh.pwek new file mode 100755 index 00000000..7bfc1ed1 --- /dev/null +++ b/applications/openvino/consumer/start.sh.pwek @@ -0,0 +1,12 @@ +#!/bin/bash + +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) 2019 Intel Corporation + +# shellcheck disable=SC1091 +source "$OPENVINO_ROOT"/bin/setupvars.sh +nginx -g "daemon on;" +sleep 2 +ffmpeg -re -stream_loop -1 -i output_320x240.mp4 -c:v copy -an -f flv rtmp://127.0.0.1:5000/live/test.flv & +# shellcheck disable=SC1091 +./main $OPENVINO_TASKSET_CPU diff --git a/applications/openvino/producer/Dockerfile b/applications/openvino/producer/Dockerfile index 8cd4f8ea..12ee01e0 100644 --- a/applications/openvino/producer/Dockerfile +++ b/applications/openvino/producer/Dockerfile @@ -14,7 +14,7 @@ WORKDIR /root COPY cmd/ ./ RUN go build main.go eaa_interface.go -FROM alpine:3.12.0 +FROM alpine:3.13 COPY --from=Builder /lib/x86_64-linux-gnu/libpthread.so.0 /lib/x86_64-linux-gnu/libpthread.so.0 COPY --from=Builder /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6 COPY --from=Builder /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 diff --git a/applications/sample-app/README.md b/applications/sample-app/README.md index 19c3032b..514ff850 100644 --- a/applications/sample-app/README.md +++ b/applications/sample-app/README.md @@ -7,5 +7,5 @@ Copyright (c) 2019-2020 Intel Corporation This application presents a simple and lightweight producer-consumer test application based on EAA APIs. -- [OpenNESS Application Development and Porting Guide](https://github.com/open-ness/specs/blob/master/doc/applications/openness_appguide.md) -- [Sample EAA Test Application Onboarding Guide - Network Edge](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-sample-application) +- [OpenNESS Application Development and Porting Guide](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_appguide.md) +- [Sample EAA Test Application Onboarding Guide - Network Edge](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-sample-application) diff --git a/applications/sample-app/go.mod b/applications/sample-app/go.mod index 7f4e88b4..71d161bf 100644 --- a/applications/sample-app/go.mod +++ b/applications/sample-app/go.mod @@ -1,4 +1,4 @@ -module github.com/open-ness/edgeapps/applications/sample-app +module github.com/smart-edge-open/edgeapps/applications/sample-app go 1.16 diff --git a/applications/sample-app/simpleEaaConsumer/consumer.go b/applications/sample-app/simpleEaaConsumer/consumer.go index 63085958..3ec60842 100644 --- a/applications/sample-app/simpleEaaConsumer/consumer.go +++ b/applications/sample-app/simpleEaaConsumer/consumer.go @@ -13,7 +13,7 @@ import ( "time" "github.com/gorilla/websocket" - "github.com/open-ness/edgeapps/applications/sample-app/common" + "github.com/smart-edge-open/edgeapps/applications/sample-app/common" "github.com/pkg/errors" ) diff --git a/applications/sample-app/simpleEaaConsumer/main.go b/applications/sample-app/simpleEaaConsumer/main.go index dfca71f6..1a6ee33b 100644 --- a/applications/sample-app/simpleEaaConsumer/main.go +++ b/applications/sample-app/simpleEaaConsumer/main.go @@ -6,7 +6,7 @@ package main import ( "log" - "github.com/open-ness/edgeapps/applications/sample-app/common" + "github.com/smart-edge-open/edgeapps/applications/sample-app/common" ) // The Consumer creates a Web Socket connection to edge node. After that diff --git a/applications/sample-app/simpleEaaProducer/main.go b/applications/sample-app/simpleEaaProducer/main.go index c93a61e8..500fea21 100644 --- a/applications/sample-app/simpleEaaProducer/main.go +++ b/applications/sample-app/simpleEaaProducer/main.go @@ -8,7 +8,7 @@ import ( "log" "time" - "github.com/open-ness/edgeapps/applications/sample-app/common" + "github.com/smart-edge-open/edgeapps/applications/sample-app/common" "github.com/pkg/errors" ) diff --git a/applications/sample-app/simpleEaaProducer/producer.go b/applications/sample-app/simpleEaaProducer/producer.go index 6743ecc2..cb64c6ef 100644 --- a/applications/sample-app/simpleEaaProducer/producer.go +++ b/applications/sample-app/simpleEaaProducer/producer.go @@ -11,7 +11,7 @@ import ( "reflect" "time" - "github.com/open-ness/edgeapps/applications/sample-app/common" + "github.com/smart-edge-open/edgeapps/applications/sample-app/common" "github.com/pkg/errors" ) diff --git a/applications/sdewan_ctrl/README.md b/applications/sdewan_ctrl/README.md index e6509b61..376e9374 100644 --- a/applications/sdewan_ctrl/README.md +++ b/applications/sdewan_ctrl/README.md @@ -3,4 +3,4 @@ SPDX-License-Identifier: Apache-2.0 Copyright (c) 2020 Intel Corporation ``` ## SDEWAN CRD Controller -OpenNESS support for SDEWAN CRD Controller is documented [here](https://github.com/open-ness/ido-specs/blob/master/doc/) +OpenNESS support for SDEWAN CRD Controller is documented [here](https://github.com/smart-edge-open/ido-specs/blob/master/doc/) diff --git a/applications/smart-city-app/README.md b/applications/smart-city-app/README.md index 262874d7..fc8b721f 100644 --- a/applications/smart-city-app/README.md +++ b/applications/smart-city-app/README.md @@ -16,7 +16,7 @@ Smart City application is a sample application that is built on top of the OpenV - [References](#references) ## Installing OpenNESS -The OpenNESS must be installed before going forward with Smart City application deployment. Installation is performed through [OpenNESS Deployment Flavors](https://github.com/open-ness/specs/blob/master/doc/flavors.md). +The OpenNESS must be installed before going forward with Smart City application deployment. Installation is performed through [OpenNESS Deployment Flavors](https://github.com/smart-edge-open/specs/blob/master/doc/flavors.md). > **NOTE:** At the time of writing this guide, there was no [Network Policy for Kubernetes](https://kubernetes.io/docs/concepts/services-networking/network-policies/) defined yet for the Smart City application. So, it is advised to remove **all** the network policies existing in the `default` namespace such as: > ```shell @@ -71,7 +71,7 @@ This mode provide an easy and quick start with executing the application in the Visual Cloud Accelerator Card - Analytics (VCAC-A) is a PCIe add on card comprising of Intel Core i3-7100U Processor with Intel HD Graphics 620 and 12 Movidius VPUs. Provisioning the network edge with VCAC-A acceleration through Converged Edge Experience Kits enables dense and performant Smart City video analytics and transcoding pipelines. -1. Deploy the OpenNESS [Media Analytics Flavor with VCAC-A](https://github.com/open-ness/specs/blob/master/doc/flavors.md#media-analytics-flavor-with-vcac-a) and place the OpenNESS edge node hostname, that has the VCAC-A card(s) plugged-in, in `edgenode_vca_group:` group in `inventory.yml` file of the converged-edge-experience-kits. +1. Deploy the OpenNESS [Media Analytics Flavor with VCAC-A](https://github.com/smart-edge-open/specs/blob/master/doc/flavors.md#media-analytics-flavor-with-vcac-a) and place the OpenNESS edge node hostname, that has the VCAC-A card(s) plugged-in, in `edgenode_vca_group:` group in `inventory.yml` file of the converged-edge-experience-kits. 2. Configure converged-edge-experience-kits to deploy "Weave Net" CNI by editing `group_vars/all/10-default.yml` @@ -129,11 +129,11 @@ helm uninstall smart-city-app ## Deploying the Smart City Application with EMCO EMCO (Edge Multi-Cluster Orchestration) is a Geo-distributed application orchestrator for Kubernetes\*. The main objective of EMCO is automation of the deployment of applications and services across clusters. It acts as a central orchestrator that can manage edge services and network functions across geographically distributed edge clusters from different third parties. Finally, the resource orchestration within a cluster of nodes will leverage Kubernetes* and Helm charts. -For more details, refer to [OpenNESS EMCO whitepaper](https://github.com/open-ness/specs/blob/master/doc/building-blocks/emco/openness-emco.md). +For more details, refer to [OpenNESS EMCO whitepaper](https://github.com/smart-edge-open/specs/blob/master/doc/building-blocks/emco/openness-emco.md). ## References -- [OpenNESS Smart City application whitepaper](https://github.com/open-ness/specs/blob/master/doc/applications/openness_ovc.md) +- [OpenNESS Smart City application whitepaper](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_ovc.md) - [Intel Open Visual Cloud Smart City reference pipeline](https://github.com/OpenVisualCloud/Smart-City-Sample) - [Intel Open Visual Cloud VCAC-A card media analytics software](https://github.com/OpenVisualCloud/VCAC-SW-Analytics/) diff --git a/applications/telemetry-sample-app/opentelemetry-agent/templates/agent-configmap.yaml b/applications/telemetry-sample-app/opentelemetry-agent/templates/agent-configmap.yaml index 4d85a8c9..a063f070 100644 --- a/applications/telemetry-sample-app/opentelemetry-agent/templates/agent-configmap.yaml +++ b/applications/telemetry-sample-app/opentelemetry-agent/templates/agent-configmap.yaml @@ -13,16 +13,13 @@ data: receivers: opencensus: endpoint: "{{ .Values.agent.receiver.opencensus.endpoint }}" - + exporters: opencensus: endpoint: "{{ .Values.agent.exporter.opencensus.endpoint }}" ca_file: {{ .Values.agent.rootca }} server_name_override: {{ .Values.agent.servername }} - extensions: - health_check: {} - service: pipelines: metrics: diff --git a/applications/telemetry-sample-app/opentelemetry-agent/values.yaml b/applications/telemetry-sample-app/opentelemetry-agent/values.yaml index 6a9ece02..68792209 100644 --- a/applications/telemetry-sample-app/opentelemetry-agent/values.yaml +++ b/applications/telemetry-sample-app/opentelemetry-agent/values.yaml @@ -8,7 +8,7 @@ namespace: default name: otel-agent-sidecar #Agent agent: - image: otel/opentelemetry-collector-dev:latest + image: otel/opentelemetry-collector:0.34.0 configmapName: otel-agent-config-vol configMap: otel-agent-conf name: otel-agent diff --git a/applications/vas-sample-app/README.md b/applications/vas-sample-app/README.md index 5bd942d8..77fd1160 100644 --- a/applications/vas-sample-app/README.md +++ b/applications/vas-sample-app/README.md @@ -14,7 +14,7 @@ Copyright (c) 2020 Intel Corporation ## Introduction This sample application demonstrates the Video Analytics Services (VAS) consumer sample application deployment and execution on the OpenNESS edge platform with VAS enabled. -For more information on VAS itself, please see [OpenNESS Video Analytics Services](https://github.com/open-ness/specs/blob/master/doc/applications/openness_va_services.md). +For more information on VAS itself, please see [OpenNESS Video Analytics Services](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_va_services.md). ## Directory Structure - `/cmd` : Application source files. diff --git a/applications/vas-sample-app/cmd/application.go b/applications/vas-sample-app/cmd/application.go index 9ea111cf..fa0d5992 100644 --- a/applications/vas-sample-app/cmd/application.go +++ b/applications/vas-sample-app/cmd/application.go @@ -62,14 +62,16 @@ func postVAServingRequest(vaEndPoint string, vaPipeline string) error { if err != nil { log.Fatal(err) } - postReconnectTries := 0 - for VASPostResp.StatusCode == http.StatusServiceUnavailable && postReconnectTries < 10 { - postReconnectTries++ - log.Println("Pipeline service is not currently available, trying again") - time.Sleep(time.Duration(5) * time.Second) - VASPostResp, err = http.Post(endPointStr, "", bytes.NewBuffer(VASReqPayload)) - if err != nil { - log.Fatal(err) + for postReconnectTries := 0; postReconnectTries < 10; postReconnectTries++ { + if VASPostResp.StatusCode == http.StatusServiceUnavailable { + log.Println("Pipeline service is not currently available, trying again") + time.Sleep(time.Duration(5) * time.Second) + VASPostResp, err = http.Post(endPointStr, "", bytes.NewBuffer(VASReqPayload)) + if err != nil { + log.Fatal(err) + } + } else { + break } } @@ -101,14 +103,16 @@ func postVAServingRequest(vaEndPoint string, vaPipeline string) error { if err != nil { log.Fatal(err) } - getReconnectTries := 0 - for VASGetResp.StatusCode == http.StatusServiceUnavailable && getReconnectTries < 10 { - getReconnectTries++ - log.Println("Pipeline status service is not currently available, trying again") - time.Sleep(time.Duration(5) * time.Second) - VASGetResp, err = http.Get(getEndPointStr) - if err != nil { - log.Fatal(err) + for getReconnectTries := 0; getReconnectTries < 10; getReconnectTries++ { + if VASGetResp.StatusCode == http.StatusServiceUnavailable { + log.Println("Pipeline status service is not currently available, trying again") + time.Sleep(time.Duration(5) * time.Second) + VASGetResp, err = http.Get(getEndPointStr) + if err != nil { + log.Fatal(err) + } + } else { + break } } diff --git a/applications/vas-sample-app/cmd/go.mod b/applications/vas-sample-app/cmd/go.mod index 990ac1e7..a176778b 100644 --- a/applications/vas-sample-app/cmd/go.mod +++ b/applications/vas-sample-app/cmd/go.mod @@ -1,4 +1,4 @@ -module github.com/open-ness/edgeapps/applications/vas-sample-app +module github.com/smart-edge-open/edgeapps/applications/vas-sample-app go 1.16 diff --git a/applications/vas-sample-app/cmd/main.go b/applications/vas-sample-app/cmd/main.go index b3a83d0f..ed88df78 100644 --- a/applications/vas-sample-app/cmd/main.go +++ b/applications/vas-sample-app/cmd/main.go @@ -98,15 +98,17 @@ func discoverServices(client *http.Client) (ServiceList, error) { log.Println("Service-discovery request failed:", err) return servList, err } - reconnectTries := 0 - for resp.StatusCode == http.StatusServiceUnavailable && reconnectTries < 10 { - reconnectTries++ - log.Println("EAA service is not currently available, trying again") - time.Sleep(time.Duration(5) * time.Second) - resp, err = client.Do(req) - if err != nil { - log.Println("Service-discovery request failed:", err) - return servList, err + for reconnectTries := 0; reconnectTries < 10; reconnectTries++ { + if resp.StatusCode == http.StatusServiceUnavailable { + log.Println("EAA service is not currently available, trying again") + time.Sleep(time.Duration(5) * time.Second) + resp, err = client.Do(req) + if err != nil { + log.Println("Service-discovery request failed:", err) + return servList, err + } + } else { + break } } if reconnectTries == 10 { diff --git a/network-functions/core-network/4G/README.md b/network-functions/core-network/4G/README.md index 848b2634..2b29cde5 100644 --- a/network-functions/core-network/4G/README.md +++ b/network-functions/core-network/4G/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## Core Network 4G -OpenNESS support for 4G CUPS is documented here [openness_epc.md](https://github.com/open-ness/specs/blob/master/doc/core-network/openness_epc.md) +OpenNESS support for 4G CUPS is documented here [openness_epc.md](https://github.com/smart-edge-open/specs/blob/master/doc/core-network/openness_epc.md) diff --git a/network-functions/core-network/5G/AF/README.md b/network-functions/core-network/5G/AF/README.md index 83b1b837..77a13b9b 100644 --- a/network-functions/core-network/5G/AF/README.md +++ b/network-functions/core-network/5G/AF/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## Core Network 5G – AF -OpenNESS supports deployment of AF in Cloudnative environment using OpenNESS for more details please refer to [openness_ngc.md](https://github.com/open-ness/specs/blob/master/doc/reference-architectures/core-network/openness_ngc.md) +OpenNESS supports deployment of AF in Cloudnative environment using OpenNESS for more details please refer to [openness_ngc.md](https://github.com/smart-edge-open/specs/blob/master/doc/reference-architectures/core-network/openness_ngc.md) diff --git a/network-functions/core-network/5G/NEF/README.md b/network-functions/core-network/5G/NEF/README.md index f67845c2..a070fd6a 100644 --- a/network-functions/core-network/5G/NEF/README.md +++ b/network-functions/core-network/5G/NEF/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## Core Network 5G – NEF -OpenNESS supports deployment of NEF in Cloudnative environment using OpenNESS for more details please refer to [openness_ngc.md](https://github.com/open-ness/specs/blob/master/doc/reference-architectures/core-network/openness_ngc.md) +OpenNESS supports deployment of NEF in Cloudnative environment using OpenNESS for more details please refer to [openness_ngc.md](https://github.com/smart-edge-open/specs/blob/master/doc/reference-architectures/core-network/openness_ngc.md) diff --git a/network-functions/core-network/5G/UPF/README.md b/network-functions/core-network/5G/UPF/README.md index 90e870c9..bdf30e09 100644 --- a/network-functions/core-network/5G/UPF/README.md +++ b/network-functions/core-network/5G/UPF/README.md @@ -6,4 +6,4 @@ Copyright (c) 2020 Intel Corporation # 5g - UPF -OpenNESS supports deployment of 5G User Plane Functions in Cloudnative environment. For more details please refer to [openness_upf.md](https://github.com/open-ness/specs/blob/master/doc/reference-architectures/core-network/openness_upf.md) +OpenNESS supports deployment of 5G User Plane Functions in Cloudnative environment. For more details please refer to [openness_upf.md](https://github.com/smart-edge-open/specs/blob/master/doc/reference-architectures/core-network/openness_upf.md) diff --git a/network-functions/ran/4G/README.md b/network-functions/ran/4G/README.md index 3b9760da..415182f7 100644 --- a/network-functions/ran/4G/README.md +++ b/network-functions/ran/4G/README.md @@ -4,5 +4,5 @@ Copyright (c) 2020 Intel Corporation ``` ## FlexRAN 4G – eNodeB -OpenNESS supports deployment of eNodeB in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/open-ness/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) +OpenNESS supports deployment of eNodeB in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/smart-edge-open/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) diff --git a/network-functions/ran/5G/du-dev/README.md b/network-functions/ran/5G/du-dev/README.md index 0990c21e..28000e08 100644 --- a/network-functions/ran/5G/du-dev/README.md +++ b/network-functions/ran/5G/du-dev/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## FlexRAN 5G – gNb -OpenNESS supports deployment of gNb (Sub6 and mmWave) in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/open-ness/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) +OpenNESS supports deployment of gNb (Sub6 and mmWave) in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/smart-edge-open/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) diff --git a/network-functions/ran/5G/gnb/README.md b/network-functions/ran/5G/gnb/README.md index 0990c21e..28000e08 100644 --- a/network-functions/ran/5G/gnb/README.md +++ b/network-functions/ran/5G/gnb/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## FlexRAN 5G – gNb -OpenNESS supports deployment of gNb (Sub6 and mmWave) in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/open-ness/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) +OpenNESS supports deployment of gNb (Sub6 and mmWave) in Cloudnative environment using OpenNESS for more details please refer to [openness_ran.md](https://github.com/smart-edge-open/ido-specs/blob/master/doc/reference-architectures/ran/openness_ran.md) diff --git a/network-functions/sdewan_cnf/README.md b/network-functions/sdewan_cnf/README.md index e7e666ec..db1b13e8 100644 --- a/network-functions/sdewan_cnf/README.md +++ b/network-functions/sdewan_cnf/README.md @@ -4,4 +4,4 @@ Copyright (c) 2020 Intel Corporation ``` ## SDEWAN CNF -OpenNESS support for SDEWAN CNF is documented [here](https://github.com/open-ness/ido-specs/tree/master/doc) +OpenNESS support for SDEWAN CNF is documented [here](https://github.com/smart-edge-open/ido-specs/tree/master/doc) diff --git a/network-functions/sdewan_cnf/e2e-scenarios/one-single-node-cluster/README.md b/network-functions/sdewan_cnf/e2e-scenarios/one-single-node-cluster/README.md index 2ab13105..b762f0bf 100644 --- a/network-functions/sdewan_cnf/e2e-scenarios/one-single-node-cluster/README.md +++ b/network-functions/sdewan_cnf/e2e-scenarios/one-single-node-cluster/README.md @@ -42,7 +42,7 @@ Configure the interface that is connected to Edge Node Server ### Deploy OpenNESS -Clone Converged Edge Experience Kits from github, and follow this [guide](https://github.com/open-ness/specs/blob/master/doc/getting-started/openness-cluster-setup.md) to prepare the node. +Clone Converged Edge Experience Kits from github, and follow this [guide](https://github.com/smart-edge-open/specs/blob/master/doc/getting-started/openness-cluster-setup.md) to prepare the node. Deploy OpenNESS: diff --git a/network-functions/sdewan_cnf/e2e-scenarios/openvino-hddl-cluster/README.md b/network-functions/sdewan_cnf/e2e-scenarios/openvino-hddl-cluster/README.md index 18b3ea09..bc9247fc 100644 --- a/network-functions/sdewan_cnf/e2e-scenarios/openvino-hddl-cluster/README.md +++ b/network-functions/sdewan_cnf/e2e-scenarios/openvino-hddl-cluster/README.md @@ -7,8 +7,8 @@ Copyright (c) 2020 Intel Corporation This sample application demonstrates OpenVINO object detection (pedestrian and vehicle detection) deployment and execution on the OpenNESS edge platform by HDDL accelerator card. -- [OpenVINO Sample Application White Paper](https://github.com/open-ness/specs/blob/master/doc/applications/openness_openvino.md) -- [OpenVINO Sample Application Onboarding Guide - Network Edge](https://github.com/open-ness/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-openvino-application) +- [OpenVINO Sample Application White Paper](https://github.com/smart-edge-open/specs/blob/master/doc/applications/openness_openvino.md) +- [OpenVINO Sample Application Onboarding Guide - Network Edge](https://github.com/smart-edge-open/specs/blob/master/doc/applications-onboard/network-edge-applications-onboarding.md#onboarding-openvino-application) ### Deploy Openness With HDDL Enable @@ -26,7 +26,7 @@ This sample application demonstrates OpenVINO object detection (pedestrian and v ``` GIT_HTTP_PROXY=http://proxy-mu.intel.com:911 GIT_USER=YouGitName - git clone https://github.com/open-ness/edgeapps.git \ + git clone https://github.com/smart-edge-open/edgeapps.git \ --config "http.proxy=$GIT_HTTP_PROXY" \ --config "credential.username=$GIT_USER" @@ -66,4 +66,4 @@ This sample application demonstrates OpenVINO object detection (pedestrian and v ### REF -- [Troubleshooting](https://github.com/open-ness/edgeapps/tree/master/applications/openvino/benchmark#troubleshooting) +- [Troubleshooting](https://github.com/smart-edge-open/edgeapps/tree/master/applications/openvino/benchmark#troubleshooting) diff --git a/network-functions/sdewan_cnf/e2e-scenarios/three-single-node-clusters/E2E-Overview.md b/network-functions/sdewan_cnf/e2e-scenarios/three-single-node-clusters/E2E-Overview.md index 42af1e5a..69510f1f 100644 --- a/network-functions/sdewan_cnf/e2e-scenarios/three-single-node-clusters/E2E-Overview.md +++ b/network-functions/sdewan_cnf/e2e-scenarios/three-single-node-clusters/E2E-Overview.md @@ -70,7 +70,7 @@ On all the three servers we should download the edgeapp repository and setup the ``` GIT_HTTP_PROXY=http://proxy-mu.intel.com:911 GIT_USER=YourGitName - git clone https://github.com/open-ness/edgeapps.git \ + git clone https://github.com/smart-edge-open/edgeapps.git \ --config "http.proxy=$GIT_HTTP_PROXY" \ --config "credential.username=$GIT_USER" diff --git a/network-functions/xran/test_verification.py b/network-functions/xran/test_verification.py index e6980469..31247828 100755 --- a/network-functions/xran/test_verification.py +++ b/network-functions/xran/test_verification.py @@ -248,7 +248,7 @@ def compare_results(rantech, cat, m_u, xran_path, direction, context): #pylint: print("test reference:", file_ref) if os.path.exists(file_tst): try: - file_tst = open(file_tst, 'r') + file_tst = open(file_tst, 'r') #pylint: disable=consider-using-with except OSError: print("Could not open/read file:", file_tst) sys.exit() @@ -258,7 +258,7 @@ def compare_results(rantech, cat, m_u, xran_path, direction, context): #pylint: return res if os.path.exists(file_ref): try: - file_ref = open(file_ref, 'r') + file_ref = open(file_ref, 'r') #pylint: disable=consider-using-with except OSError: print("Could not open/read file:", file_ref) sys.exit() @@ -302,14 +302,14 @@ def compare_results(rantech, cat, m_u, xran_path, direction, context): #pylint: res = -1 print("FAIL:", "IndexError on tst: ant:[", i, "]:", offset, slot_idx, sym_idx, line_idx, len(tst)) - raise GetOutOfLoops + raise GetOutOfLoops #pylint: disable=raise-missing-from try: line_ref = ref[offset].rstrip() except IndexError: res = -1 print("FAIL:", "IndexError on ref: ant:[", i, "]:", offset, slot_idx, sym_idx, line_idx, len(ref)) - raise GetOutOfLoops + raise GetOutOfLoops #pylint: disable=raise-missing-from if comp == 1: # discard LSB bits as BFP compression is not "bit exact"