WIFI-900: add global property for toggling mutation of clientCn

-Dtip.wlan.preventClientCnAlteration=false //default, change to avoid
appending the serial number to the clientCn
This commit is contained in:
Mike Hansen
2020-10-05 13:29:05 -04:00
parent 1d8889a857
commit 4d624233c6
22 changed files with 763 additions and 172 deletions

View File

@@ -28,7 +28,9 @@ COPY app/opensync/ProfileSsid.json /app/opensync/ProfileSsid.json
COPY app/opensync/LocationBuildingExample.json /app/opensync/LocationBuildingExample.json
COPY app/opensync/ProfileMetrics.json /app/opensync/ProfileMetrics.json
COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json
COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json
COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json
COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json
VOLUME ["/app/logs", "/app/config"]
RUN chmod +x /app/run.sh

View File

@@ -0,0 +1,55 @@
[
{
"model_type": "Profile",
"id": 7777,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
"details": {
"model_type": "Hotspot2Profile",
"enableInterworkingAndHs20": true,
"hessid": null,
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"additionalStepsRequiredForAccess": 0,
"deauthRequestTimeout": 0,
"operatingClass": 0,
"termsAndConditionsFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
"fileCategory": "ExternalPolicyConfiguration",
"fileType": "TEXT",
"altSlot": false
},
"whitelistDomain": null,
"emergencyServicesReachable": true,
"unauthenticatedEmergencyServiceAccessible": false,
"internetConnectivity": true,
"connectionCapabilitySet": [
{
"model_type": "ConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
"qosMapSetConfiguration": null,
"apGeospatialLocation": null,
"apCivicLocation": null,
"apPublicLocationIdUri": null,
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"childProfileIds": [
5555,
6666
]
}
]

View File

@@ -0,0 +1,35 @@
[
{
"model_type": "Profile",
"id": 5555,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
"details": {
"model_type": "OperatorProfile",
"domainName": "telecominfraproject.atlassian.net",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
"x509CertificateLocation": "/etc/ca.pem",
"operatorFriendlyName": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"childProfileIds": []
}
]

View File

@@ -0,0 +1,40 @@
[
{
"model_type": "Profile",
"id": 6666,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
"details": {
"model_type": "VenueProfile",
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
}
],
"venueTypeAssignment": {
"model_type": "VenueTypeAssignment",
"venueDescription": "Research and Development Facility",
"venueGroupId": 2,
"venueTypeId": 8
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"childProfileIds": []
}
]

View File

@@ -34,6 +34,9 @@ OVSDB_SERVER_TRUSTSTORE_PASSWORD="${OVSDB_SERVER_TRUSTSTORE_PASSWORD:=mypassword
OVSDB_EQUIPMENT_CONFIG_FILE="${OVSDB_EQUIPMENT_CONFIG_FILE:=/app/opensync/EquipmentExample.json}"
OVSDB_APPROFILE_CONFIG_FILE="${OVSDB_AP_PROFILE_CONFIG_FILE:=/app/opensync/ProfileAPExample.json}"
OVSDB_METRICSPROFILE_CONFIG_FILE="${OVSDB_METRICSPROFILE_CONFIG_FILE:=/app/opensync/ProfileMetrics.json}"
OVSDB_HOTSPOT20SPROFILE_CONFIG_FILE="${OVSDB_HOTSPOT20PROFILE_CONFIG_FILE:=/app/opensync/ProfileHotspot20.json}"
OVSDB_OPERATORPROFILE_CONFIG_FILE="${OVSDB_OPERATORPROFILE_CONFIG_FILE:=/app/opensync/ProfileOperator.json}"
OVSDB_VENUEPROFILE_CONFIG_FILE="${OVSDB_VENUESPROFILE_CONFIG_FILE:=/app/opensync/ProfileVenue.json}"
OVSDB_RFPROFILE_CONFIG_FILE="${OVSDB_RF_PROFILE_CONFIG_FILE:=/app/opensync/ProfileRf.json}"
OVSDB_SSIDPROFILE_CONFIG_FILE="${OVSDB_SSIDPROFILE_CONFIG_FILE:=/app/opensync/ProfileSsid.json}"
OVSDB_LOCATION_CONFIG_FILE="${OVSDB_LOCATION_CONFIG_FILE:=/app/opensync/LocationBuildingExample.json}"
@@ -132,6 +135,9 @@ OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.keyStorePassword=$OVSDB_SERVER_KEYSTO
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICSPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"

View File

@@ -15,6 +15,9 @@ COPY app/opensync/ProfileSsid.json /app/opensync/ProfileSsid.json
COPY app/opensync/LocationBuildingExample.json /app/opensync/LocationBuildingExample.json
COPY app/opensync/ProfileMetrics.json /app/opensync/ProfileMetrics.json
COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json
COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json
COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json
COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json
RUN chmod +x /app/run.sh

View File

@@ -0,0 +1,55 @@
[
{
"model_type": "Profile",
"id": 7777,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
"details": {
"model_type": "Hotspot2Profile",
"enableInterworkingAndHs20": true,
"hessid": null,
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"additionalStepsRequiredForAccess": 0,
"deauthRequestTimeout": 0,
"operatingClass": 0,
"termsAndConditionsFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
"lastModifiedTimestamp": null,
"apExportUrl": "https://localhost:9091/filestore/termsAndConditions",
"fileCategory": "ExternalPolicyConfiguration",
"fileType": "TEXT",
"altSlot": false
},
"whitelistDomain": null,
"emergencyServicesReachable": true,
"unauthenticatedEmergencyServiceAccessible": false,
"internetConnectivity": true,
"connectionCapabilitySet": [
{
"model_type": "ConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
"qosMapSetConfiguration": null,
"apGeospatialLocation": null,
"apCivicLocation": null,
"apPublicLocationIdUri": null,
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"childProfileIds": [
5555,
6666
]
}
]

View File

@@ -0,0 +1,35 @@
[
{
"model_type": "Profile",
"id": 5555,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
"details": {
"model_type": "OperatorProfile",
"domainName": "telecominfraproject.atlassian.net",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
"x509CertificateLocation": "/etc/ca.pem",
"operatorFriendlyName": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"childProfileIds": []
}
]

View File

@@ -0,0 +1,40 @@
[
{
"model_type": "Profile",
"id": 6666,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
"details": {
"model_type": "VenueProfile",
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
}
],
"venueTypeAssignment": {
"model_type": "VenueTypeAssignment",
"venueDescription": "Research and Development Facility",
"venueGroupId": 2,
"venueTypeId": 8
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"childProfileIds": []
}
]

View File

@@ -22,6 +22,9 @@ OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.customerEquipmentFileName=$OVSDB_EQUIPMENT_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.apProfileFileName=$OVSDB_APPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICSPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.radiusProfileFileName=$OVSDB_RADIUSPROFILE_CONFIG_FILE"