Skip to content

Commit 068ed0f

Browse files
dilallkxdilallkx
committed
Merge branch 'release-1.3.0'
2 parents 4ce2977 + b27cde4 commit 068ed0f

File tree

869 files changed

+40429
-29850
lines changed

Some content is hidden

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

869 files changed

+40429
-29850
lines changed

‎.meepctl-repocfg.yaml‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version: 1.2.0
15+
version: 1.3.0
1616
repo:
1717
name: AdvantEDGE
1818
core:
@@ -27,7 +27,10 @@ repo:
2727
chart: charts/meep-ctrl-engine
2828
codecov: true
2929
lint: true
30+
nodeport: 30000
31+
api: go-apps/meep-ctrl-engine/api/swagger.yaml
3032
docker-data:
33+
api: bin/meep-swagger-ui
3134
static: bin/meep-frontend
3235
meep-frontend:
3336
src: js-apps/meep-frontend
@@ -36,6 +39,18 @@ repo:
3639
lint: true
3740
local-deps:
3841
meep-ctrl-engine-api: js-packages/meep-ctrl-engine-client
42+
meep-swagger-ui:
43+
src: js-apps/meep-swagger-ui
44+
bin: bin/meep-swagger-ui
45+
codecov: false
46+
lint: false
47+
api-bundle:
48+
- meep-ctrl-engine
49+
- meep-metrics-engine
50+
- meep-mg-manager
51+
- meep-mg-app-notification
52+
- meep-loc-serv
53+
- meep-loc-serv-notification
3954
meep-webhook:
4055
src: go-apps/meep-webhook
4156
bin: bin/meep-webhook
@@ -50,6 +65,8 @@ repo:
5065
chart: charts/meep-mg-manager
5166
codecov: true
5267
lint: true
68+
nodeport: 30005
69+
api: go-apps/meep-mg-manager/api/swagger.yaml
5370
meep-mon-engine:
5471
src: go-apps/meep-mon-engine
5572
bin: bin/meep-mon-engine
@@ -66,6 +83,8 @@ repo:
6683
- -mod=vendor
6784
codecov: true
6885
lint: true
86+
nodeport: 30007
87+
api: go-apps/meep-loc-serv/api/swagger.yaml
6988
meep-metrics-engine:
7089
src: go-apps/meep-metrics-engine
7190
bin: bin/meep-metrics-engine
@@ -74,6 +93,8 @@ repo:
7493
- -mod=vendor
7594
codecov: true
7695
lint: true
96+
nodeport: 30008
97+
api: go-apps/meep-metrics-engine/api/swagger.yaml
7798
meep-tc-engine:
7899
src: go-apps/meep-tc-engine
79100
bin: bin/meep-tc-engine
@@ -92,6 +113,10 @@ repo:
92113
template: charts/meep-virt-engine/virt-templates
93114
codecov: true
94115
lint: true
116+
meep-loc-serv-notification:
117+
api: go-packages/meep-loc-serv-notification-client/api/swagger.yaml
118+
meep-mg-app-notification:
119+
api: go-packages/meep-mg-app-client/api/swagger.yaml
95120
dep:
96121
docker-registry:
97122
chart: charts/docker-registry

‎charts/meep-virt-engine/virt-templates/values-template.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,19 @@ deployment:
5555

5656
nodeSelector: {}
5757
tolerations: []
58-
affinity: {}
59-
60-
58+
affinity:
59+
{{- if .Deployment.PlacementId}}
60+
nodeAffinity:
61+
requiredDuringSchedulingIgnoredDuringExecution:
62+
nodeSelectorTerms:
63+
- matchExpressions:
64+
- key: kubernetes.io/hostname
65+
operator: In
66+
values:
67+
- {{.Deployment.PlacementId}}
68+
{{- else}}
69+
{}
70+
{{- end}}
6171

6272
service:
6373
enabled: {{.Service.Enabled}}

‎charts/meep-webhook/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ spec:
5656
- name: init-{{ .Values.deployment.dependency }}
5757
image: busybox
5858
imagePullPolicy: IfNotPresent
59-
command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo wiating for {{ .Values.deployment.dependency }}; sleep2; done;']
59+
command: ['sh', '-c', 'until nslookup {{ .Values.deployment.dependency }} ; do echo waiting for {{ .Values.deployment.dependency }}; sleep 0.25; done;']

‎examples/demo1/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ cd ~/AdvantEDGE/examples/demo1/
111111

112112
#### Configure demo specific dashboards
113113

114-
Follow the procedure described in [Scenario Monitoring](../../docs/use/monitoring.md#configure-dashboards). The demo specific dashboard that is loaded can also be found at `~/AdvantEDGE/examples/demo1/demo1-dashboards.json`
114+
Follow the procedure described in [Scenario Monitoring](https://github.com/InterDigitalInc/AdvantEDGE/wiki/scenario-monitoring#configure-monitoring). The demo specific dashboard that is loaded can also be found at `~/AdvantEDGE/examples/demo1/demo1-dashboards.json`
115115

116116
#### Start iperf proxy
117117

‎examples/demo1/demo1-dashboards.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"description": "",
118118
"version": 1,
119119
"kibanaSavedObjectMeta": {
120-
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
120+
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
121121
}
122122
}
123123
},
@@ -131,7 +131,7 @@
131131
"description": "",
132132
"version": 1,
133133
"kibanaSavedObjectMeta": {
134-
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
134+
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"language\":\"lucene\",\"query\":\"\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
135135
}
136136
}
137137
},
@@ -145,7 +145,7 @@
145145
"description": "",
146146
"version": 1,
147147
"kibanaSavedObjectMeta": {
148-
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
148+
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue1-iperf\",\"params\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue1-iperf\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
149149
}
150150
}
151151
},
@@ -159,9 +159,9 @@
159159
"description": "",
160160
"version": 1,
161161
"kibanaSavedObjectMeta": {
162-
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.dest\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.dest\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
162+
"searchSourceJSON": "{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.msgType\",\"value\":\"ingressPacketStats\",\"params\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.msgType\":{\"query\":\"ingressPacketStats\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}},{\"meta\":{\"index\":\"27b98a60-bb57-11e8-a056-d1ed6789004e\",\"negate\":false,\"disabled\":false,\"alias\":null,\"type\":\"phrase\",\"key\":\"meep.log.src\",\"value\":\"ue2-svc\",\"params\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}},\"query\":{\"match\":{\"meep.log.src\":{\"query\":\"ue2-svc\",\"type\":\"phrase\"}}},\"$state\":{\"store\":\"appState\"}}]}"
163163
}
164164
}
165165
}
166166
]
167-
}
167+
}

‎examples/demo1/demo1-scenario.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,4 +424,4 @@ deployment:
424424
terminalLinkLatencyVariation: 1
425425
terminalLinkThroughput: 20
426426
terminalLinkPacketLoss: 0
427-
physicalLocations: null
427+
physicalLocations: null

‎examples/demo1/src/demo-client/js/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.9

‎examples/demo1/src/demo-client/js/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# meep_demo_app_api
22

33
MeepDemoAppApi - JavaScript client for meep_demo_app_api
4-
Copyright (c) 2019 InterDigital Communications, Inc 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.
4+
No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
55
This SDK is automatically generated by the [Swagger Codegen](https://github.com/swagger-api/swagger-codegen) project:
66

77
- API version: 0.0.1

‎examples/demo1/src/demo-client/js/docs/MobilityGroupEvent.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ Name | Type | Description | Notes
1515

1616
* `UPDATE` (value: `"STATE-UPDATE"`)
1717

18-
* `TRANSFER-START` (value: `"STATE-TRANSFER-START"`)
18+
* `TRANSFER_START` (value: `"STATE-TRANSFER-START"`)
1919

20-
* `TRANSFER-COMPLETE` (value: `"STATE-TRANSFER-COMPLETE"`)
20+
* `TRANSFER_COMPLETE` (value: `"STATE-TRANSFER-COMPLETE"`)
2121

22-
* `TRANSFER-CANCEL` (value: `"STATE-TRANSFER-CANCEL"`)
22+
* `TRANSFER_CANCEL` (value: `"STATE-TRANSFER-CANCEL"`)
2323

2424

2525

‎examples/demo1/src/demo-client/js/docs/TrackingNotification.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Name | Type | Description | Notes
55
------------ | ------------- | ------------- | -------------
66
**callbackData** | **String** | CallBackData if passed by the application during the associated Subscription (Zone or User Tracking) operation |
77
**zoneId** | **String** | Unique Identifier of a Location Zone | [optional]
8-
**address** | **String** | Address of the user or device based on the connected access point - address = acr:<UE IP address> | [optional]
8+
**address** | **String** | Address of the user or device based on the connected access point - address = acr:<UE IP address> | [optional]
99
**interestRealm** | **String** | Details about the access point, geographical position, industry, etc. | [optional]
1010
**userEventType** | [**UserEventType**](UserEventType.md) | | [optional]
1111
**currentAccessPointId** | **String** | Unique identifier of a point of access | [optional]

0 commit comments

Comments
 (0)