Skip to content

Commit f17c9bd

Browse files
rsarwadrsarwad
committed
Resolved merge conflicts
Signed-off-by: rashmi <[email protected]>
2 parents 1e5e81f + f12afa3 commit f17c9bd

File tree

4,420 files changed

+90178
-79655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,420 files changed

+90178
-79655
lines changed

‎.circleci/config.yml‎

Lines changed: 543 additions & 358 deletions
Large diffs are not rendered by default.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
Add supporting screenshots, terminal pastes, etc. as necessary
1515
-->
1616

17-
# Additional Information
17+
## Additional Information
1818

19-
[ ] This change is backwards-breaking
19+
- [ ] This change is backwards-breaking
2020

2121
<!--
2222
If this is a backwards-breaking change, document the upgrade instructions.

‎.github/workflows/dco-check.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: DCO check
2+
on:
3+
pull_request:
4+
types:
5+
- opened
6+
- reopened
7+
- synchronize
8+
9+
jobs:
10+
dco_check_job:
11+
runs-on: ubuntu-latest
12+
name: DCO Check
13+
steps:
14+
- name: Get PR Commits
15+
id: 'get-pr-commits'
16+
uses: tim-actions/get-pr-commits@master
17+
with:
18+
token: ${{ secrets.GITHUB_TOKEN }}
19+
- name: DCO Check
20+
uses: tim-actions/dco@master
21+
with:
22+
commits: ${{ steps.get-pr-commits.outputs.commits }}

‎.gitignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dist/
3131
eggs/
3232
lib/
3333
lib64/
34+
!orc8r/lib/
3435
!feg/radius/lib/
3536
parts/
3637
sdist/
@@ -75,3 +76,23 @@ orc8r/cloud/helm/**/.secrets/
7576
# Clion config
7677
devmand/gateway/.idea/
7778
devmand/gateway/cmake-build-debug/
79+
80+
# Log files
81+
*.log
82+
83+
# Cscope and tags
84+
cscope.*
85+
tags
86+
87+
#CI files
88+
archives/
89+
test_results_magma_converged_mme.html
90+
91+
#intellij
92+
.idea/
93+
94+
# Internal
95+
fb
96+
97+
#MacOS artifacts
98+
.DS_Store

‎CODEOWNERS‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
.circleci/ @xjtian @tmdzk
2+
circleci/ @xjtian @tmdzk
3+
4+
*/cloud/ @xjtian @mpgermano @hcgatewood
5+
6+
orc8r/ @xjtian @mpgermano @hcgatewood
7+
8+
feg/ @themarwhal @mpgermano @uri200
9+
10+
# More specific mappings for lte/gateway will override this top-level one
11+
lte/gateway @xjtian @ardzoht
12+
lte/gateway/c/session_manager @themarwhal @uri200
13+
lte/gateway/c/oai @ssanadhya @ulaskozat @lionelgo
14+
lte/gateway/c/sctpd @ssanadhya @ulaskozat
15+
lte/gateway/release @kkahrs
16+
lte/gateway/python/magma/pipelined @koolzz @pshelar
17+
18+
nms/ @karthiksubraveti @andreilee @xjtian
19+
20+
CODEOWNERS @xjtian @amarpad

‎ci-scripts/JenkinsFile-GitLab‎

Lines changed: 754 additions & 0 deletions
Large diffs are not rendered by default.

‎ci-scripts/adapt-mme-yaml.sed‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
################################################################################
2+
# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The OpenAirInterface Software Alliance licenses this file to You under
6+
# the terms found in the LICENSE file in the root of this
7+
# source tree.
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#-------------------------------------------------------------------------------
15+
# For more information about the OpenAirInterface (OAI) Software Alliance:
16+
# [email protected]
17+
################################################################################
18+
s@s11_iface_name: "eth[0-9]"@s11_iface_name: "eth0"@
19+
s@remote_sgw_ip: "[0-9.]*"@remote_sgw_ip: "192.168.61.130"@

‎ci-scripts/adapt-spgwc-pool-ip.sed‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
################################################################################
2+
# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The OpenAirInterface Software Alliance licenses this file to You under
6+
# the terms found in the LICENSE file in the root of this
7+
# source tree.
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#-------------------------------------------------------------------------------
15+
# For more information about the OpenAirInterface (OAI) Software Alliance:
16+
# [email protected]
17+
################################################################################
18+
s@oai.ipv4@magma.ipv4@
19+
s@12.1.1.2 @192.168.128.2 @
20+
s@12.1.1.128@192.168.128.128@

‎ci-scripts/adapt-spgwu-pool-ip.sed‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
################################################################################
2+
# Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The OpenAirInterface Software Alliance licenses this file to You under
6+
# the terms found in the LICENSE file in the root of this
7+
# source tree.
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
#-------------------------------------------------------------------------------
15+
# For more information about the OpenAirInterface (OAI) Software Alliance:
16+
# [email protected]
17+
################################################################################
18+
s@12.1.1.0@192.168.128.0@
19+
s@SNAT = "yes"@SNAT = "no"@

‎ci-scripts/checkCodingFormattingRules.sh‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
#!/bin/bash
2+
#/*
3+
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
4+
# * contributor license agreements. See the NOTICE file distributed with
5+
# * this work for additional information regarding copyright ownership.
6+
# * The OpenAirInterface Software Alliance licenses this file to You under
7+
# * the terms found in the LICENSE file in the root of this
8+
# * source tree.
9+
# *
10+
# * Unless required by applicable law or agreed to in writing, software
11+
# * distributed under the License is distributed on an "AS IS" BASIS,
12+
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# * See the License for the specific language governing permissions and
14+
# * limitations under the License.
15+
# *-------------------------------------------------------------------------------
16+
# * For more information about the OpenAirInterface (OAI) Software Alliance:
17+
# * [email protected]
18+
# */
19+
20+
function usage {
21+
echo "OAI Coding / Formatting Guideline Check script"
22+
echo " Original Author: Raphael Defosseux"
23+
echo ""
24+
echo " Requirement: clang-format / git shall be installed"
25+
echo ""
26+
echo " By default (no options) the complete repository will be checked"
27+
echo " In case of merge/pull request, provided source and target branch,"
28+
echo " the script will check only the modified files"
29+
echo ""
30+
echo "Usage:"
31+
echo "------"
32+
echo " checkCodingFormattingRules.sh [OPTIONS]"
33+
echo ""
34+
echo "Options:"
35+
echo "--------"
36+
echo " --src-branch #### OR -sb ####"
37+
echo " Specify the source branch of the merge request."
38+
echo ""
39+
echo " --target-branch #### OR -tb ####"
40+
echo " Specify the target branch of the merge request (usually develop)."
41+
echo ""
42+
echo " --help OR -h"
43+
echo " Print this help message."
44+
echo ""
45+
}
46+
47+
if [ $# -ne 4 ] && [ $# -ne 1 ] && [ $# -ne 0 ]
48+
then
49+
echo "Syntax Error: not the correct number of arguments"
50+
echo ""
51+
usage
52+
exit 1
53+
fi
54+
55+
if [ $# -eq 0 ]
56+
then
57+
echo " ---- Checking the whole repository ----"
58+
echo ""
59+
if [ -f oai_rules_result.txt ]
60+
then
61+
rm -f oai_rules_result.txt
62+
fi
63+
if [ -f oai_rules_result_list.txt ]
64+
then
65+
rm -f oai_rules_result_list.txt
66+
fi
67+
EXTENSION_LIST=("h" "hpp" "c" "cpp")
68+
NB_TO_FORMAT=0
69+
NB_TOTAL=0
70+
for EXTENSION in "${EXTENSION_LIST[@]}"
71+
do
72+
echo "Checking for all files with .${EXTENSION} extension"
73+
FILE_LIST=`tree -n --noreport -i -f -P *.${EXTENSION} | sed -e 's#^\./##' | grep -v test | grep "\.${EXTENSION}"`
74+
for FILE_TO_CHECK in "${FILE_LIST[@]}"
75+
do
76+
TO_FORMAT=`clang-format -output-replacements-xml ${FILE_TO_CHECK} 2>&1 | grep -v replacements | grep -c replacement`
77+
NB_TOTAL=$((NB_TOTAL + 1))
78+
if [ $TO_FORMAT -ne 0 ]
79+
then
80+
NB_TO_FORMAT=$((NB_TO_FORMAT + 1))
81+
# In case of full repo, being silent
82+
#echo "$FILE_TO_CHECK"
83+
echo "$FILE_TO_CHECK" >> ./oai_rules_result_list.txt
84+
fi
85+
done
86+
done
87+
echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT over $NB_TOTAL checked!"
88+
echo "NB_FILES_FAILING_CHECK=$NB_TO_FORMAT" > ./oai_rules_result.txt
89+
echo "NB_FILES_CHECKED=$NB_TOTAL" >> ./oai_rules_result.txt
90+
exit 0
91+
fi
92+
93+
checker=0
94+
while [[ $# -gt 0 ]]
95+
do
96+
key="$1"
97+
98+
case $key in
99+
-h|--help)
100+
shift
101+
usage
102+
exit 0
103+
;;
104+
-sb|--src-branch)
105+
SOURCE_BRANCH="$2"
106+
let "checker|=0x1"
107+
shift
108+
shift
109+
;;
110+
-tb|--target-branch)
111+
TARGET_BRANCH="$2"
112+
let "checker|=0x2"
113+
shift
114+
shift
115+
;;
116+
*)
117+
echo "Syntax Error: unknown option: $key"
118+
echo ""
119+
usage
120+
exit 1
121+
esac
122+
123+
done
124+
125+
126+
if [ $checker -ne 3 ]
127+
then
128+
echo "Source Branch is : $SOURCE_BRANCH"
129+
echo "Target Branch is : $TARGET_BRANCH"
130+
echo ""
131+
echo "Syntax Error: missing option"
132+
echo ""
133+
usage
134+
exit 1
135+
fi
136+
137+
# Merge request scenario
138+
139+
MERGE_COMMMIT=`git log -n1 --pretty=format:%H`
140+
if [ -f .git/refs/remotes/origin/$TARGET_BRANCH ]
141+
then
142+
TARGET_INIT_COMMIT=`cat .git/refs/remotes/origin/$TARGET_BRANCH`
143+
else
144+
TARGET_INIT_COMMIT=`git log -n1 --pretty=format:%H origin/$TARGET_BRANCH`
145+
fi
146+
147+
echo " ---- Checking the modified files by the merge request ----"
148+
echo ""
149+
echo "Source Branch is : $SOURCE_BRANCH"
150+
echo "Target Branch is : $TARGET_BRANCH"
151+
echo "Merged Commit is : $MERGE_COMMMIT"
152+
echo "Target Init is : $TARGET_INIT_COMMIT"
153+
echo ""
154+
echo " ----------------------------------------------------------"
155+
echo ""
156+
157+
# Retrieve the list of modified files since the latest develop commit
158+
MODIFIED_FILES=`git log $TARGET_INIT_COMMIT..$MERGE_COMMMIT --oneline --name-status | egrep "^M|^A" | sed -e "s@^M\t*@@" -e "s@^A\t*@@" | sort | uniq | grep -v test`
159+
NB_TO_FORMAT=0
160+
NB_TOTAL=0
161+
162+
if [ -f oai_rules_result.txt ]
163+
then
164+
rm -f oai_rules_result.txt
165+
fi
166+
if [ -f oai_rules_result_list.txt ]
167+
then
168+
rm -f oai_rules_result_list.txt
169+
fi
170+
for FULLFILE in $MODIFIED_FILES
171+
do
172+
filename=$(basename -- "$FULLFILE")
173+
EXT="${filename##*.}"
174+
if [ $EXT = "c" ] || [ $EXT = "h" ] || [ $EXT = "cpp" ] || [ $EXT = "hpp" ]
175+
then
176+
SRC_FILE=`echo $FULLFILE | sed -e "s#src/##"`
177+
TO_FORMAT=`clang-format -output-replacements-xml ${SRC_FILE} 2>&1 | grep -v replacements | grep -c replacement`
178+
NB_TOTAL=$((NB_TOTAL + 1))
179+
if [ $TO_FORMAT -ne 0 ]
180+
then
181+
NB_TO_FORMAT=$((NB_TO_FORMAT + 1))
182+
echo $FULLFILE
183+
echo $FULLFILE >> ./oai_rules_result_list.txt
184+
fi
185+
fi
186+
done
187+
echo ""
188+
echo " ----------------------------------------------------------"
189+
echo "Nb Files that do NOT follow OAI rules: $NB_TO_FORMAT over $NB_TOTAL checked!"
190+
echo "NB_FILES_FAILING_CHECK=$NB_TO_FORMAT" > ./oai_rules_result.txt
191+
echo "NB_FILES_CHECKED=$NB_TOTAL" >> ./oai_rules_result.txt
192+
193+
exit 0

0 commit comments

Comments
 (0)