standardize field title

contiv · Jan 22, 2016 · 7380f46 · 7380f46
1 parent 69ff0b9
commit 7380f46
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/app.json b/app.json
@@ -8,11 +8,11 @@
 			"properties": {
 				"appName": {
 					"type": "string",
-					"description": "Application Name"
+					"title": "Application Name"
 				},
 				"tenantName": {
 					"type": "string",
-					"description": "Tenant Name"
+					"title": "Tenant Name"
 				}
 			},
 			"link-sets": {

diff --git a/client/contivModel.js b/client/contivModel.js
@@ -44,9 +44,9 @@ var AppModalView = React.createClass({
 	        <div className='modal-body' style={ {margin: '5%',} }>
 
 
-				<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
+				<Input type='text' label='Application Name' ref='appName' defaultValue={obj.appName} placeholder='Application Name' />
 
-				<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
+				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
 			</div>
 	        <div className='modal-footer'>
@@ -488,7 +488,7 @@ var ServiceModalView = React.createClass({
 	        <div className='modal-body' style={ {margin: '5%',} }>
 
 
-				<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
+				<Input type='text' label='Application Name' ref='appName' defaultValue={obj.appName} placeholder='Application Name' />
 
 				<Input type='text' label='' ref='command' defaultValue={obj.command} placeholder='' />
 
@@ -506,9 +506,9 @@ var ServiceModalView = React.createClass({
 
 				<Input type='text' label='' ref='scale' defaultValue={obj.scale} placeholder='' />
 
-				<Input type='text' label='' ref='serviceName' defaultValue={obj.serviceName} placeholder='' />
+				<Input type='text' label='Service Name' ref='serviceName' defaultValue={obj.serviceName} placeholder='Service Name' />
 
-				<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
+				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
 				<Input type='text' label='' ref='volumeProfile' defaultValue={obj.volumeProfile} placeholder='' />
 
@@ -567,11 +567,11 @@ var ServiceInstanceModalView = React.createClass({
 
 				<Input type='text' label='' ref='appName' defaultValue={obj.appName} placeholder='' />
 
-				<Input type='text' label='' ref='instanceId' defaultValue={obj.instanceId} placeholder='' />
+				<Input type='text' label='Service instance id' ref='instanceId' defaultValue={obj.instanceId} placeholder='Service instance id' />
 
 				<Input type='text' label='' ref='serviceName' defaultValue={obj.serviceName} placeholder='' />
 
-				<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
+				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
 				<Input type='text' label='' ref='volumes' defaultValue={obj.volumes} placeholder='' />
 
@@ -693,9 +693,9 @@ var VolumeModalView = React.createClass({
 
 				<Input type='text' label='' ref='size' defaultValue={obj.size} placeholder='' />
 
-				<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
+				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
-				<Input type='text' label='' ref='volumeName' defaultValue={obj.volumeName} placeholder='' />
+				<Input type='text' label='Volume Name' ref='volumeName' defaultValue={obj.volumeName} placeholder='Volume Name' />
 
 			</div>
 	        <div className='modal-footer'>
@@ -758,9 +758,9 @@ var VolumeProfileModalView = React.createClass({
 
 				<Input type='text' label='' ref='size' defaultValue={obj.size} placeholder='' />
 
-				<Input type='text' label='' ref='tenantName' defaultValue={obj.tenantName} placeholder='' />
+				<Input type='text' label='Tenant Name' ref='tenantName' defaultValue={obj.tenantName} placeholder='Tenant Name' />
 
-				<Input type='text' label='' ref='volumeProfileName' defaultValue={obj.volumeProfileName} placeholder='' />
+				<Input type='text' label='Volume profile Name' ref='volumeProfileName' defaultValue={obj.volumeProfileName} placeholder='Volume profile Name' />
 
 			</div>
 	        <div className='modal-footer'>

diff --git a/client/contivModelClient.go b/client/contivModelClient.go
@@ -122,8 +122,8 @@ type App struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AppName    string `json:"appName,omitempty"`    //
-	TenantName string `json:"tenantName,omitempty"` //
+	AppName    string `json:"appName,omitempty"`    // Application Name
+	TenantName string `json:"tenantName,omitempty"` // Tenant Name
 
 	// add link-sets and links
 	LinkSets AppLinkSets `json:"link-sets,omitempty"`
@@ -248,7 +248,7 @@ type Service struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AppName        string   `json:"appName,omitempty"` //
+	AppName        string   `json:"appName,omitempty"` // Application Name
 	Command        string   `json:"command,omitempty"` //
 	Cpu            string   `json:"cpu,omitempty"`     //
 	EndpointGroups []string `json:"endpointGroups,omitempty"`
@@ -257,8 +257,8 @@ type Service struct {
 	Memory         string   `json:"memory,omitempty"`    //
 	Networks       []string `json:"networks,omitempty"`
 	Scale          int      `json:"scale,omitempty"`         //
-	ServiceName    string   `json:"serviceName,omitempty"`   //
-	TenantName     string   `json:"tenantName,omitempty"`    //
+	ServiceName    string   `json:"serviceName,omitempty"`   // Service Name
+	TenantName     string   `json:"tenantName,omitempty"`    // Tenant Name
 	VolumeProfile  string   `json:"volumeProfile,omitempty"` //
 
 	// add link-sets and links
@@ -282,9 +282,9 @@ type ServiceInstance struct {
 	Key string `json:"key,omitempty"`
 
 	AppName     string   `json:"appName,omitempty"`     //
-	InstanceID  string   `json:"instanceId,omitempty"`  //
+	InstanceID  string   `json:"instanceId,omitempty"`  // Service instance id
 	ServiceName string   `json:"serviceName,omitempty"` //
-	TenantName  string   `json:"tenantName,omitempty"`  //
+	TenantName  string   `json:"tenantName,omitempty"`  // Tenant Name
 	Volumes     []string `json:"volumes,omitempty"`
 
 	// add link-sets and links
@@ -328,8 +328,8 @@ type Volume struct {
 	MountPoint    string `json:"mountPoint,omitempty"`    //
 	PoolName      string `json:"poolName,omitempty"`      //
 	Size          string `json:"size,omitempty"`          //
-	TenantName    string `json:"tenantName,omitempty"`    //
-	VolumeName    string `json:"volumeName,omitempty"`    //
+	TenantName    string `json:"tenantName,omitempty"`    // Tenant Name
+	VolumeName    string `json:"volumeName,omitempty"`    // Volume Name
 
 	// add link-sets and links
 	LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
@@ -352,8 +352,8 @@ type VolumeProfile struct {
 	MountPoint        string `json:"mountPoint,omitempty"`        //
 	PoolName          string `json:"poolName,omitempty"`          //
 	Size              string `json:"size,omitempty"`              //
-	TenantName        string `json:"tenantName,omitempty"`        //
-	VolumeProfileName string `json:"volumeProfileName,omitempty"` //
+	TenantName        string `json:"tenantName,omitempty"`        // Tenant Name
+	VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
 
 	// add link-sets and links
 	LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`

diff --git a/contivModel.go b/contivModel.go
@@ -19,8 +19,8 @@ type App struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AppName    string `json:"appName,omitempty"`    //
-	TenantName string `json:"tenantName,omitempty"` //
+	AppName    string `json:"appName,omitempty"`    // Application Name
+	TenantName string `json:"tenantName,omitempty"` // Tenant Name
 
 	// add link-sets and links
 	LinkSets AppLinkSets `json:"link-sets,omitempty"`
@@ -145,7 +145,7 @@ type Service struct {
 	// every object has a key
 	Key string `json:"key,omitempty"`
 
-	AppName        string   `json:"appName,omitempty"` //
+	AppName        string   `json:"appName,omitempty"` // Application Name
 	Command        string   `json:"command,omitempty"` //
 	Cpu            string   `json:"cpu,omitempty"`     //
 	EndpointGroups []string `json:"endpointGroups,omitempty"`
@@ -154,8 +154,8 @@ type Service struct {
 	Memory         string   `json:"memory,omitempty"`    //
 	Networks       []string `json:"networks,omitempty"`
 	Scale          int      `json:"scale,omitempty"`         //
-	ServiceName    string   `json:"serviceName,omitempty"`   //
-	TenantName     string   `json:"tenantName,omitempty"`    //
+	ServiceName    string   `json:"serviceName,omitempty"`   // Service Name
+	TenantName     string   `json:"tenantName,omitempty"`    // Tenant Name
 	VolumeProfile  string   `json:"volumeProfile,omitempty"` //
 
 	// add link-sets and links
@@ -179,9 +179,9 @@ type ServiceInstance struct {
 	Key string `json:"key,omitempty"`
 
 	AppName     string   `json:"appName,omitempty"`     //
-	InstanceID  string   `json:"instanceId,omitempty"`  //
+	InstanceID  string   `json:"instanceId,omitempty"`  // Service instance id
 	ServiceName string   `json:"serviceName,omitempty"` //
-	TenantName  string   `json:"tenantName,omitempty"`  //
+	TenantName  string   `json:"tenantName,omitempty"`  // Tenant Name
 	Volumes     []string `json:"volumes,omitempty"`
 
 	// add link-sets and links
@@ -225,8 +225,8 @@ type Volume struct {
 	MountPoint    string `json:"mountPoint,omitempty"`    //
 	PoolName      string `json:"poolName,omitempty"`      //
 	Size          string `json:"size,omitempty"`          //
-	TenantName    string `json:"tenantName,omitempty"`    //
-	VolumeName    string `json:"volumeName,omitempty"`    //
+	TenantName    string `json:"tenantName,omitempty"`    // Tenant Name
+	VolumeName    string `json:"volumeName,omitempty"`    // Volume Name
 
 	// add link-sets and links
 	LinkSets VolumeLinkSets `json:"link-sets,omitempty"`
@@ -249,8 +249,8 @@ type VolumeProfile struct {
 	MountPoint        string `json:"mountPoint,omitempty"`        //
 	PoolName          string `json:"poolName,omitempty"`          //
 	Size              string `json:"size,omitempty"`              //
-	TenantName        string `json:"tenantName,omitempty"`        //
-	VolumeProfileName string `json:"volumeProfileName,omitempty"` //
+	TenantName        string `json:"tenantName,omitempty"`        // Tenant Name
+	VolumeProfileName string `json:"volumeProfileName,omitempty"` // Volume profile Name
 
 	// add link-sets and links
 	LinkSets VolumeProfileLinkSets `json:"link-sets,omitempty"`

diff --git a/service.json b/service.json
@@ -8,15 +8,15 @@
 			"properties": {
 				"serviceName": {
 					"type": "string",
-					"description": "Service Name"
+					"title": "Service Name"
 				},
 				"appName": {
 					"type": "string",
-					"description": "Application Name"
+					"title": "Application Name"
 				},
 				"tenantName": {
 					"type": "string",
-					"description": "Tenant Name"
+					"title": "Tenant Name"
 				},
 				"imageName": {
 					"type": "string"

diff --git a/serviceInstance.json b/serviceInstance.json
@@ -8,11 +8,11 @@
 			"properties": {
 				"instanceId": {
 					"type": "string",
-					"description": "Service instance id"
+					"title": "Service instance id"
 				},
 				"tenantName": {
 					"type": "string",
-					"description": "Tenant Name"
+					"title": "Tenant Name"
 				},
 				"appName": {
 					"type": "string"

diff --git a/volume.json b/volume.json
@@ -8,11 +8,11 @@
 			"properties": {
 				"volumeName": {
 					"type": "string",
-					"description": "Volume Name"
+					"title": "Volume Name"
 				},
 				"tenantName": {
 					"type": "string",
-					"description": "Tenant Name"
+					"title": "Tenant Name"
 				},
 				"datastoreType": {
 					"type": "string"

diff --git a/volumeProfile.json b/volumeProfile.json
@@ -8,11 +8,11 @@
 			"properties": {
 				"volumeProfileName": {
 					"type": "string",
-					"description": "Volume profile Name"
+					"title": "Volume profile Name"
 				},
 				"tenantName": {
 					"type": "string",
-					"description": "Tenant Name"
+					"title": "Tenant Name"
 				},
 				"datastoreType": {
 					"type": "string"