OpenTAM-DPIS: REST-API swagger-doc DpiStatistics.json format bug fix
Change-Id: Id17e6c14b09469f63f6e1c94a482b403b25ce80b
diff --git a/web/api/src/main/resources/definitions/DpiStatistics.json b/web/api/src/main/resources/definitions/DpiStatistics.json
index 43f4679..d9f3010 100644
--- a/web/api/src/main/resources/definitions/DpiStatistics.json
+++ b/web/api/src/main/resources/definitions/DpiStatistics.json
@@ -116,187 +116,187 @@
"format": "int32",
"example": 9889
}
+ }
+ },
+ "detectedProtos": {
+ "type": "array",
+ "xml": {
+ "name": "detectedProtos",
+ "wrapped": true
},
- "detectedProtos": {
- "type": "array",
- "xml": {
- "name": "detectedProtos",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "protos",
- "required": [
- "name",
- "breed",
- "packets",
- "bytes",
- "flows"
- ],
- "properties": {
- "name": {
- "type": "string",
- "example": "TCP"
- },
- "breed": {
- "type": "string",
- "example": "Acceptable"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "flows": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- }
+ "items": {
+ "type": "object",
+ "title": "protos",
+ "required": [
+ "name",
+ "breed",
+ "packets",
+ "bytes",
+ "flows"
+ ],
+ "properties": {
+ "name": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "breed": {
+ "type": "string",
+ "example": "Acceptable"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "flows": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
}
}
+ }
+ },
+ "knownFlows": {
+ "type": "array",
+ "xml": {
+ "name": "knownFlows",
+ "wrapped": true
},
- "knownFlows": {
- "type": "array",
- "xml": {
- "name": "knownFlows",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "knownFlows",
- "required": [
- "protocol",
- "hostAName",
- "hostAPort",
- "hostBName",
- "hostBPort",
- "detectedProtocol",
- "detectedProtocolName",
- "packets",
- "bytes",
- "hostServerName"
- ],
- "properties": {
- "protocol": {
- "type": "string",
- "example": "TCP"
- },
- "hostAName": {
- "type": "string",
- "example": "10.0.20.50"
- },
- "hostAPort": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- },
- "hostBName": {
- "type": "string",
- "example": "10.0.20.10"
- },
- "hostBPort": {
- "type": "integer",
- "format": "int32",
- "example": 8181
- },
- "detectedProtocol": {
- "type": "integer",
- "format": "int32",
- "example": 80
- },
- "detectedProtocolName": {
- "type": "string",
- "example": "HTTP"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "hostSeverName": {
- "type": "string",
- "example": "raptor"
- }
+ "items": {
+ "type": "object",
+ "title": "knownFlows",
+ "required": [
+ "protocol",
+ "hostAName",
+ "hostAPort",
+ "hostBName",
+ "hostBPort",
+ "detectedProtocol",
+ "detectedProtocolName",
+ "packets",
+ "bytes",
+ "hostServerName"
+ ],
+ "properties": {
+ "protocol": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "hostAName": {
+ "type": "string",
+ "example": "10.0.20.50"
+ },
+ "hostAPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
+ },
+ "hostBName": {
+ "type": "string",
+ "example": "10.0.20.10"
+ },
+ "hostBPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 8181
+ },
+ "detectedProtocol": {
+ "type": "integer",
+ "format": "int32",
+ "example": 80
+ },
+ "detectedProtocolName": {
+ "type": "string",
+ "example": "HTTP"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "hostSeverName": {
+ "type": "string",
+ "example": "raptor"
}
}
+ }
+ },
+ "unknownFlows": {
+ "type": "array",
+ "xml": {
+ "name": "unknownFlows",
+ "wrapped": true
},
- "unknownFlows": {
- "type": "array",
- "xml": {
- "name": "unknownFlows",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "unknownFlows",
- "required": [
- "protocol",
- "hostAName",
- "hostAPort",
- "hostBName",
- "hostBPort",
- "detectedProtocol",
- "detectedProtocolName",
- "packets",
- "bytes",
- "hostServerName"
- ],
- "properties": {
- "protocol": {
- "type": "string",
- "example": "TCP"
- },
- "hostAName": {
- "type": "string",
- "example": "10.0.20.50"
- },
- "hostAPort": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- },
- "hostBName": {
- "type": "string",
- "example": "10.0.20.10"
- },
- "hostBPort": {
- "type": "integer",
- "format": "int32",
- "example": 8181
- },
- "detectedProtocol": {
- "type": "integer",
- "format": "int32",
- "example": 80
- },
- "detectedProtocolName": {
- "type": "string",
- "example": "HTTP"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "hostSeverName": {
- "type": "string",
- "example": "raptor"
- }
+ "items": {
+ "type": "object",
+ "title": "unknownFlows",
+ "required": [
+ "protocol",
+ "hostAName",
+ "hostAPort",
+ "hostBName",
+ "hostBPort",
+ "detectedProtocol",
+ "detectedProtocolName",
+ "packets",
+ "bytes",
+ "hostServerName"
+ ],
+ "properties": {
+ "protocol": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "hostAName": {
+ "type": "string",
+ "example": "10.0.20.50"
+ },
+ "hostAPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
+ },
+ "hostBName": {
+ "type": "string",
+ "example": "10.0.20.10"
+ },
+ "hostBPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 8181
+ },
+ "detectedProtocol": {
+ "type": "integer",
+ "format": "int32",
+ "example": 80
+ },
+ "detectedProtocolName": {
+ "type": "string",
+ "example": "HTTP"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "hostSeverName": {
+ "type": "string",
+ "example": "raptor"
}
}
}
diff --git a/web/api/src/main/resources/definitions/DpiStatisticsPost.json b/web/api/src/main/resources/definitions/DpiStatisticsPost.json
index 43f4679..d9f3010 100644
--- a/web/api/src/main/resources/definitions/DpiStatisticsPost.json
+++ b/web/api/src/main/resources/definitions/DpiStatisticsPost.json
@@ -116,187 +116,187 @@
"format": "int32",
"example": 9889
}
+ }
+ },
+ "detectedProtos": {
+ "type": "array",
+ "xml": {
+ "name": "detectedProtos",
+ "wrapped": true
},
- "detectedProtos": {
- "type": "array",
- "xml": {
- "name": "detectedProtos",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "protos",
- "required": [
- "name",
- "breed",
- "packets",
- "bytes",
- "flows"
- ],
- "properties": {
- "name": {
- "type": "string",
- "example": "TCP"
- },
- "breed": {
- "type": "string",
- "example": "Acceptable"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "flows": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- }
+ "items": {
+ "type": "object",
+ "title": "protos",
+ "required": [
+ "name",
+ "breed",
+ "packets",
+ "bytes",
+ "flows"
+ ],
+ "properties": {
+ "name": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "breed": {
+ "type": "string",
+ "example": "Acceptable"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "flows": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
}
}
+ }
+ },
+ "knownFlows": {
+ "type": "array",
+ "xml": {
+ "name": "knownFlows",
+ "wrapped": true
},
- "knownFlows": {
- "type": "array",
- "xml": {
- "name": "knownFlows",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "knownFlows",
- "required": [
- "protocol",
- "hostAName",
- "hostAPort",
- "hostBName",
- "hostBPort",
- "detectedProtocol",
- "detectedProtocolName",
- "packets",
- "bytes",
- "hostServerName"
- ],
- "properties": {
- "protocol": {
- "type": "string",
- "example": "TCP"
- },
- "hostAName": {
- "type": "string",
- "example": "10.0.20.50"
- },
- "hostAPort": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- },
- "hostBName": {
- "type": "string",
- "example": "10.0.20.10"
- },
- "hostBPort": {
- "type": "integer",
- "format": "int32",
- "example": 8181
- },
- "detectedProtocol": {
- "type": "integer",
- "format": "int32",
- "example": 80
- },
- "detectedProtocolName": {
- "type": "string",
- "example": "HTTP"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "hostSeverName": {
- "type": "string",
- "example": "raptor"
- }
+ "items": {
+ "type": "object",
+ "title": "knownFlows",
+ "required": [
+ "protocol",
+ "hostAName",
+ "hostAPort",
+ "hostBName",
+ "hostBPort",
+ "detectedProtocol",
+ "detectedProtocolName",
+ "packets",
+ "bytes",
+ "hostServerName"
+ ],
+ "properties": {
+ "protocol": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "hostAName": {
+ "type": "string",
+ "example": "10.0.20.50"
+ },
+ "hostAPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
+ },
+ "hostBName": {
+ "type": "string",
+ "example": "10.0.20.10"
+ },
+ "hostBPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 8181
+ },
+ "detectedProtocol": {
+ "type": "integer",
+ "format": "int32",
+ "example": 80
+ },
+ "detectedProtocolName": {
+ "type": "string",
+ "example": "HTTP"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "hostSeverName": {
+ "type": "string",
+ "example": "raptor"
}
}
+ }
+ },
+ "unknownFlows": {
+ "type": "array",
+ "xml": {
+ "name": "unknownFlows",
+ "wrapped": true
},
- "unknownFlows": {
- "type": "array",
- "xml": {
- "name": "unknownFlows",
- "wrapped": true
- },
- "items": {
- "type": "object",
- "title": "unknownFlows",
- "required": [
- "protocol",
- "hostAName",
- "hostAPort",
- "hostBName",
- "hostBPort",
- "detectedProtocol",
- "detectedProtocolName",
- "packets",
- "bytes",
- "hostServerName"
- ],
- "properties": {
- "protocol": {
- "type": "string",
- "example": "TCP"
- },
- "hostAName": {
- "type": "string",
- "example": "10.0.20.50"
- },
- "hostAPort": {
- "type": "integer",
- "format": "int32",
- "example": 9889
- },
- "hostBName": {
- "type": "string",
- "example": "10.0.20.10"
- },
- "hostBPort": {
- "type": "integer",
- "format": "int32",
- "example": 8181
- },
- "detectedProtocol": {
- "type": "integer",
- "format": "int32",
- "example": 80
- },
- "detectedProtocolName": {
- "type": "string",
- "example": "HTTP"
- },
- "packets": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "bytes": {
- "type": "integer",
- "format": "int64",
- "example": 69889
- },
- "hostSeverName": {
- "type": "string",
- "example": "raptor"
- }
+ "items": {
+ "type": "object",
+ "title": "unknownFlows",
+ "required": [
+ "protocol",
+ "hostAName",
+ "hostAPort",
+ "hostBName",
+ "hostBPort",
+ "detectedProtocol",
+ "detectedProtocolName",
+ "packets",
+ "bytes",
+ "hostServerName"
+ ],
+ "properties": {
+ "protocol": {
+ "type": "string",
+ "example": "TCP"
+ },
+ "hostAName": {
+ "type": "string",
+ "example": "10.0.20.50"
+ },
+ "hostAPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 9889
+ },
+ "hostBName": {
+ "type": "string",
+ "example": "10.0.20.10"
+ },
+ "hostBPort": {
+ "type": "integer",
+ "format": "int32",
+ "example": 8181
+ },
+ "detectedProtocol": {
+ "type": "integer",
+ "format": "int32",
+ "example": 80
+ },
+ "detectedProtocolName": {
+ "type": "string",
+ "example": "HTTP"
+ },
+ "packets": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "bytes": {
+ "type": "integer",
+ "format": "int64",
+ "example": 69889
+ },
+ "hostSeverName": {
+ "type": "string",
+ "example": "raptor"
}
}
}