AETHER-3129 change ICCID and IMEI to string
Change-Id: I80fcfba9120d39dffe49f0f55f3c2b986447f170
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 4ea71be..96c29f4 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.0.18
+version: 2.0.19
appVersion: v0.0.0
keywords:
- aether
@@ -24,7 +24,7 @@
- name: config-model-aether-2
condition: onos-config.models.aether.v2.enabled
repository: "file://../config-models/aether-2.0.x"
- version: 2.0.8
+ version: 2.0.9
- name: config-model-aether-4
condition: onos-config.models.aether.v4.enabled
repository: "file://../config-models/aether-4.x"
diff --git a/config-models/aether-2.0.x/Chart.yaml b/config-models/aether-2.0.x/Chart.yaml
index cd214d8..45a5170 100644
--- a/config-models/aether-2.0.x/Chart.yaml
+++ b/config-models/aether-2.0.x/Chart.yaml
@@ -4,7 +4,7 @@
apiVersion: v2
name: config-model-aether-2
-version: 2.0.8
+version: 2.0.0
kubeVersion: ">=1.18.0"
appVersion: 2.0.0
description: Aether config model
diff --git a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
index a1c71a9..c8356a7 100755
--- a/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-aether-types.yang
@@ -24,14 +24,18 @@
}
typedef imei {
- type uint64 {
+ type string {
+ length 14..16;
+ pattern '[0-9]{14,16}';
}
description "International Mobile Equipment Identity";
}
typedef iccid {
- type uint64 {
- }
+ type string {
+ length 19..22;
+ pattern '[0-9]{18,21}[0-9A-F]';
+ }
description "Integrated Circuit Card ID";
}