Commit 8e01f927 authored by Daniel Baur's avatar Daniel Baur

Updated operating system handling

parent 41a1ea4a
......@@ -262,25 +262,14 @@
"type" : "enum",
"name" : "operatingSystemArchitecture"
},
"operatingSystemVendor" : "apiObject",
"operatingSystemFamily" :
{
"type" : "enum",
"name" : "operatingSystemFamily"
},
"version" : "string"
}
},
"operatingSystemVendor" :
{
"api" : "colosseumapi",
"entityName" : "osVendor",
"form" :
{
"name" : "string",
"operatingSystemVendorType" :
{
"type" : "enum",
"name" : "operatingSystemVendorType"
}
},
"tostring" : "name"
},
"providedPort" :
{
"api" : "colosseumapi",
......@@ -531,4 +520,4 @@
"sensorDescription" :"apiObject"
}
}
}
\ No newline at end of file
}
......@@ -3,8 +3,9 @@
"flowOperator" : ["MAP","REDUCE"],
"ipType" : ["PUBLIC","PRIVATE"],
"locationScope" : ["REGION","ZONE","HOST"],
"operatingSystemArchitecture" : ["I386","AMD64"],
"operatingSystemArchitecture" : ["I386","AMD64","UNKNOWN"],
"operatingSystemVendorType" : ["NIX","WINDOWS"],
"operatingSystemFamily": ["UNKNOWN", "AIX", "ARCH", "CENTOS", "DARWIN", "DEBIAN", "ESX", "FEDORA", "FREEBSD", "GENTOO", "HPUX", "COREOS", "AMZN_LINUX", "MANDRIVA", "NETBSD", "OEL", "OPENBSD", "RHEL", "SCIENTIFIC", "CEL", "SLACKWARE", "SOLARIS", "SUSE", "TURBOLINUX","CLOUD_LINUX","UBUNTU","WINDOWS"],
"sensors" : [
"de.uniulm.omi.cloudiator.visor.sensors.CpuUsageSensor",
"de.uniulm.omi.cloudiator.visor.sensors.MemoryUsageSensor",
......@@ -34,4 +35,4 @@
],
"timeUnit" : ["MILISECONDS","SECONDS","MINUTES","HOURS","DAYS","WEEKS","MONTHS","YEARS"],
"windowType" : ["TimeWindow"]
}
\ No newline at end of file
}
[
{
"name" : "Dashboard",
"group" :
[
{"apiObject" : "application"},
{"apiObject" : "applicationInstance"},
{"apiObject" : "virtualMachine"},
{"apiObject" : "instance"},
{"apiObject" : "component"},
{"apiObject" : "ipAddress","name" : "ip address"}
]
},
{
"name" : "Monitors",
"group" :
[
{"apiObject" : "monitorInstance"},
{"apiObject" : "rawMonitor"},
{"apiObject" : "composedMonitor"},
{"apiObject" : "constantMonitor"}
]
},
{
"name" : "Configuration" ,
"group" :
[
{"apiObject" : "frontendUser"},
{"apiObject" : "tenant"},
{"apiObject" : "cloudCredential"}
]
},
{
"name" : "Cloud",
"group" :
[
{"apiObject" : "cloud"},
{"apiObject" : "api"},
{"apiObject" : "image"},
{"apiObject" : "operatingSystem"},
{"apiObject" : "operatingSystemVendor"},
{"apiObject" : "hardware"},
{"apiObject" : "hardwareOffer"},
{"apiObject" : "location"},
{"apiObject" : "geoLocation"}
]
},
{
"name" : "Other",
"group" :
[
{"apiObject" : "virtualMachineTemplate"},
{"apiObject" : "applicationComponent"},
{"apiObject" : "communication"},
{"apiObject" : "requiredPort"},
{"apiObject" : "providedPort"}
]
}
]
\ No newline at end of file
{
"name": "Application",
"group": [
{
"apiObject": "application"
},
{
"apiObject": "component"
},
{
"apiObject": "virtualMachineTemplate"
},
{
"apiObject": "applicationComponent"
},
{
"apiObject": "communication"
},
{
"apiObject": "requiredPort"
},
{
"apiObject": "providedPort"
}
]
},
{
"name": "Instance",
"group": [
{
"apiObject": "applicationInstance"
},
{
"apiObject": "virtualMachine"
},
{
"apiObject": "instance"
},
{
"apiObject": "ipAddress",
"name": "ip address"
}
]
},
{
"name": "Monitoring",
"group": [
{
"apiObject": "monitorInstance"
},
{
"apiObject": "rawMonitor"
},
{
"apiObject": "composedMonitor"
},
{
"apiObject": "constantMonitor"
}
]
},
{
"name": "Cloud",
"group": [
{
"apiObject": "cloud"
},
{
"apiObject": "api"
},
{
"apiObject": "cloudCredential"
},
{
"apiObject": "image"
},
{
"apiObject": "operatingSystem"
},
{
"apiObject": "hardware"
},
{
"apiObject": "hardwareOffer"
},
{
"apiObject": "location"
},
{
"apiObject": "geoLocation"
}
]
},
{
"name": "Configuration",
"group": [
{
"apiObject": "frontendUser"
},
{
"apiObject": "tenant"
}
]
}
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment