Add changes from Jenkins ciab patchset test
Change-Id: I814c0e06d635a11bd1de6a92becc02c0f0d52d96
diff --git a/Makefile b/Makefile
index c5ff503..a75854f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
BUILD ?= /tmp/build
M ?= $(BUILD)/milestones
MAKEDIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-SCRIPTDIR := $(MAKEDIR)../scripts
+SCRIPTDIR := $(MAKEDIR)/scripts
RESOURCEDIR := $(MAKEDIR)/resources
WORKSPACE ?= $(HOME)
VENV ?= $(BUILD)/venv/aiab
@@ -130,8 +130,8 @@
sudo ip route replace 192.168.252.0/24 via 192.168.251.1 dev enb
kubectl apply -f $(RESOURCEDIR)/router.yaml
kubectl wait pod -n default --for=condition=Ready -l app=router --timeout=300s
- kubectl -n default exec router ip route add 10.250.0.0/16 via 192.168.250.3
- kubectl delete net-attach-def sgi-net
+ kubectl -n default exec router ip route add 20.250.0.0/16 via 192.168.250.3
+ kubectl delete net-attach-def core-net
touch $@
$(M)/omec: | $(M)/helm-ready /opt/cni/bin/simpleovs /opt/cni/bin/static $(M)/fabric
@@ -139,15 +139,17 @@
helm upgrade --install $(HELM_GLOBAL_ARGS) \
--namespace omec \
--values $(AIABVALUES) \
+ --set images.pullPolicy=Always \
omec-control-plane \
- cord/omec-control-plane && \
+ $(WORKSPACE)/cord/aether-helm-charts/omec/omec-control-plane && \
kubectl rollout status -n omec statefulset spgwc && \
helm upgrade --install $(HELM_GLOBAL_ARGS) \
--namespace omec \
--values $(AIABVALUES) \
+ --set images.pullPolicy=Always \
omec-user-plane \
- cord/omec-user-plane && \
- kubectl rollout status -n omec statefulset spgwu
+ $(WORKSPACE)/cord/aether-helm-charts/omec/omec-user-plane && \
+ kubectl rollout status -n omec statefulset upf
touch $@
# UE images includes kernel module, ue_ip.ko
@@ -168,7 +170,8 @@
sudo ip addr add 127.0.0.2/8 dev lo || true
$(eval mme_iface=$(shell ip -4 route list default | awk -F 'dev' '{ print $$2; exit }' | awk '{ print $$1 }'))
helm upgrade --install $(HELM_GLOBAL_ARGS) --namespace omec oaisim cord/oaisim -f $(AIABVALUES) \
- --set config.enb.networks.s1_mme.interface=$(mme_iface)
+ --set config.enb.networks.s1_mme.interface=$(mme_iface) \
+ --set images.pullPolicy=IfNotPresent
kubectl rollout status -n omec statefulset ue
@timeout 60s bash -c \
"until ip addr show oip1 | grep -q inet; \
@@ -196,9 +199,9 @@
clean: reset-test
helm delete --purge $(shell helm ls -q) || true
kubectl delete po router || true
- kubectl delete net-attach-def sgi-net || true
- sudo ovs-vsctl del-br br-s1u-net || true
- sudo ovs-vsctl del-br br-sgi-net || true
+ kubectl delete net-attach-def core-net || true
+ sudo ovs-vsctl del-br br-access-net || true
+ sudo ovs-vsctl del-br br-core-net || true
sudo apt remove --purge openvswitch-switch -y
source "$(VENV)/bin/activate" && cd $(BUILD)/kubespray; \
ansible-playbook -b -i inventory/local/hosts.ini reset.yml
diff --git a/aether-in-a-box-values.yaml b/aether-in-a-box-values.yaml
index 3ed828a..743c3ff 100644
--- a/aether-in-a-box-values.yaml
+++ b/aether-in-a-box-values.yaml
@@ -12,19 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-images:
- tags:
- init: docker.io/omecproject/pod-init:1.0.0
- depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
- hssdb: docker.io/omecproject/c3po-hssdb:master-2c49778
- hss: docker.io/omecproject/c3po-hss:master-2c49778
- mme: docker.io/omecproject/openmme:master-ab37a71
- mmeExporter: docker.io/omecproject/mme-exporter:paging-latest
- spgwc: docker.io/omecproject/ngic-cp:central-cp-multi-upfs-e8257e7
- bess: docker.io/omecproject/upf-epc-bess:master-554b670
- cpiface: docker.io/omecproject/upf-epc-cpiface:master-554b670
- pullPolicy: IfNotPresent
-
# cassandra values
cassandra:
config:
@@ -35,8 +22,11 @@
enabled: false
config:
- spgwu:
- mode: "af_packet"
+ spgwc:
+ pfcp: true
+ ueIpPool:
+ ip: 20.250.0.0
+ upf:
name: "oaisim"
sriov:
enabled: false
@@ -44,6 +34,9 @@
enabled: false
cniPlugin: simpleovs
ipam: static
+ cfgFiles:
+ upf.json:
+ mode: af_packet
mme:
cfgFiles:
config.json:
@@ -56,12 +49,16 @@
dig1: 0
dig2: 1
dig3: -1
+ apnlist:
+ internet: "spgwc"
hss:
bootstrap:
- key: "465b5ce8b199b49faa5f0a2ee238a6bc"
- opc: "d4416644f6154936193433dd20a0ace0"
users:
- - imsiStart: "208014567891201"
+ - apn: "internet"
+ key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+ opc: "d4416644f6154936193433dd20a0ace0"
+ sqn: 96
+ imsiStart: "208014567891201"
msisdnStart: "1122334455"
count: 10
# oaisim values
diff --git a/resources/router.yaml b/resources/router.yaml
index 1c01919..142aee2 100644
--- a/resources/router.yaml
+++ b/resources/router.yaml
@@ -16,7 +16,7 @@
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: sgi-net
+ name: core-net
spec:
config: '{
"type": "simpleovs",
@@ -28,7 +28,7 @@
apiVersion: "k8s.cni.cncf.io/v1"
kind: NetworkAttachmentDefinition
metadata:
- name: s1u-net
+ name: access-net
spec:
config: '{
"type": "simpleovs",
@@ -57,9 +57,9 @@
app: router
annotations:
k8s.v1.cni.cncf.io/networks: '[
- { "name": "sgi-net", "interface": "sgi-rtr", "ips": "192.168.250.1/24" },
+ { "name": "core-net", "interface": "sgi-rtr", "ips": "192.168.250.1/24" },
{ "name": "enb-net", "interface": "enb-rtr", "ips": "192.168.251.1/24" },
- { "name": "s1u-net", "interface": "s1u-rtr", "ips": "192.168.252.1/24" }
+ { "name": "access-net", "interface": "s1u-rtr", "ips": "192.168.252.1/24" }
]'
spec:
containers: