Skip to content

O
origin-web-common
Commit f53e010c by Sam Padgett Committed by GitHub
Options

Merge pull request #235 from spadgett/catalog-external-service-properties 

Adopt renamed service external name properies
parents 0e7a5f40 98e5af4f
Showing with 24 additions and 24 deletions
dist/origin-web-common-services.js
...@@ -1312,7 +1312,7 @@ angular.module("openshiftCommonServices") ...@@ -1312,7 +1312,7 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances, return _.sortBy(serviceInstances,
function(item) { function(item) {
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name'); var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName; return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.clusterServiceClassExternalName;
}, },
function(item) { function(item) {
return _.get(item, 'metadata.name', ''); return _.get(item, 'metadata.name', '');
......
dist/origin-web-common-ui.js
...@@ -1819,9 +1819,9 @@ angular.module('openshiftCommonUI') ...@@ -1819,9 +1819,9 @@ angular.module('openshiftCommonUI')
return serviceClassDisplayNameFilter(serviceClass); return serviceClassDisplayNameFilter(serviceClass);
} }
var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName'); var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
if (externalServiceClassName) { if (serviceClassExternalName) {
return externalServiceClassName; return serviceClassExternalName;
} }
return _.get(instance, 'metadata.name'); return _.get(instance, 'metadata.name');
......
dist/origin-web-common.js
...@@ -2014,9 +2014,9 @@ angular.module('openshiftCommonUI') ...@@ -2014,9 +2014,9 @@ angular.module('openshiftCommonUI')
return serviceClassDisplayNameFilter(serviceClass); return serviceClassDisplayNameFilter(serviceClass);
} }
var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName'); var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
if (externalServiceClassName) { if (serviceClassExternalName) {
return externalServiceClassName; return serviceClassExternalName;
} }
return _.get(instance, 'metadata.name'); return _.get(instance, 'metadata.name');
...@@ -3336,7 +3336,7 @@ angular.module("openshiftCommonServices") ...@@ -3336,7 +3336,7 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances, return _.sortBy(serviceInstances,
function(item) { function(item) {
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name'); var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName; return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.clusterServiceClassExternalName;
}, },
function(item) { function(item) {
return _.get(item, 'metadata.name', ''); return _.get(item, 'metadata.name', '');
......
dist/origin-web-common.min.js
...@@ -897,8 +897,8 @@ return serviceClassDisplayName ? serviceClassDisplayName :_.get(serviceClass, "s ...@@ -897,8 +897,8 @@ return serviceClassDisplayName ? serviceClassDisplayName :_.get(serviceClass, "s
}).filter("serviceInstanceDisplayName", [ "serviceClassDisplayNameFilter", function(serviceClassDisplayNameFilter) { }).filter("serviceInstanceDisplayName", [ "serviceClassDisplayNameFilter", function(serviceClassDisplayNameFilter) {
return function(instance, serviceClass) { return function(instance, serviceClass) {
if (serviceClass) return serviceClassDisplayNameFilter(serviceClass); if (serviceClass) return serviceClassDisplayNameFilter(serviceClass);
var externalServiceClassName = _.get(instance, "spec.externalClusterServiceClassName"); var serviceClassExternalName = _.get(instance, "spec.clusterServiceClassExternalName");
return externalServiceClassName ? externalServiceClassName :_.get(instance, "metadata.name"); return serviceClassExternalName ? serviceClassExternalName :_.get(instance, "metadata.name");
}; };
} ]).filter("serviceInstanceStatus", [ "isServiceInstanceReadyFilter", function(isServiceInstanceReadyFilter) { } ]).filter("serviceInstanceStatus", [ "isServiceInstanceReadyFilter", function(isServiceInstanceReadyFilter) {
return function(instance) { return function(instance) {
...@@ -1467,7 +1467,7 @@ return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], serv ...@@ -1467,7 +1467,7 @@ return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], serv
}, sortServiceInstances = function(serviceInstances, serviceClasses) { }, sortServiceInstances = function(serviceInstances, serviceClasses) {
return serviceInstances || serviceClasses ? _.sortBy(serviceInstances, function(item) { return serviceInstances || serviceClasses ? _.sortBy(serviceInstances, function(item) {
var serviceClassName = _.get(item, "spec.clusterServiceClassRef.name"); var serviceClassName = _.get(item, "spec.clusterServiceClassRef.name");
return _.get(serviceClasses, [ serviceClassName, "spec", "externalMetadata", "displayName" ]) || item.spec.externalClusterServiceClassName; return _.get(serviceClasses, [ serviceClassName, "spec", "externalMetadata", "displayName" ]) || item.spec.clusterServiceClassExternalName;
}, function(item) { }, function(item) {
return _.get(item, "metadata.name", ""); return _.get(item, "metadata.name", "");
}) :null; }) :null;
......
src/filters/resources.js
...@@ -190,9 +190,9 @@ angular.module('openshiftCommonUI') ...@@ -190,9 +190,9 @@ angular.module('openshiftCommonUI')
return serviceClassDisplayNameFilter(serviceClass); return serviceClassDisplayNameFilter(serviceClass);
} }
var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName'); var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
if (externalServiceClassName) { if (serviceClassExternalName) {
return externalServiceClassName; return serviceClassExternalName;
} }
return _.get(instance, 'metadata.name'); return _.get(instance, 'metadata.name');
......
src/services/bindService.js
...@@ -195,7 +195,7 @@ angular.module("openshiftCommonServices") ...@@ -195,7 +195,7 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances, return _.sortBy(serviceInstances,
function(item) { function(item) {
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name'); var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName; return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.clusterServiceClassExternalName;
}, },
function(item) { function(item) {
return _.get(item, 'metadata.name', ''); return _.get(item, 'metadata.name', '');
......
test/spec/filters/isServiceInstanceFailedSpec.js
...@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceFailed", function() { ...@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceFailed", function() {
"uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002", "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
}, },
"spec": { "spec": {
"externalClusterServiceClassName": "mariadb-persistent", "clusterServiceClassExternalName": "mariadb-persistent",
"externalClusterServicePlanName": "default", "clusterServicePlanExternalName": "default",
"clusterServiceClassRef": { "clusterServiceClassRef": {
"name": "475554bf-aec9-11e7-8d0c-b6c718ff6445", "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
"uid": "581f692a-aec9-11e7-bae6-0242ac110002", "uid": "581f692a-aec9-11e7-bae6-0242ac110002",
......
test/spec/filters/isServiceInstanceReadySpec.js
...@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceReady", function() { ...@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceReady", function() {
"uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002", "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
}, },
"spec": { "spec": {
"externalClusterServiceClassName": "mariadb-persistent", "clusterServiceClassExternalName": "mariadb-persistent",
"externalClusterServicePlanName": "default", "clusterServicePlanExternalName": "default",
"clusterServiceClassRef": { "clusterServiceClassRef": {
"name": "475554bf-aec9-11e7-8d0c-b6c718ff6445", "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
"uid": "581f692a-aec9-11e7-bae6-0242ac110002", "uid": "581f692a-aec9-11e7-bae6-0242ac110002",
......
test/spec/filters/serviceInstanceDisplayNameSpec.js
...@@ -23,7 +23,7 @@ describe("Filter: serviceInstanceDisplayName", function() { ...@@ -23,7 +23,7 @@ describe("Filter: serviceInstanceDisplayName", function() {
name: 'jenkins-ephemeral-2jk9x' name: 'jenkins-ephemeral-2jk9x'
}, },
spec: { spec: {
externalClusterServiceClassName: 'jenkins-ephemeral' clusterServiceClassExternalName: 'jenkins-ephemeral'
} }
}; };
...@@ -43,7 +43,7 @@ describe("Filter: serviceInstanceDisplayName", function() { ...@@ -43,7 +43,7 @@ describe("Filter: serviceInstanceDisplayName", function() {
expect(result).toEqual("jenkins-ephemeral"); expect(result).toEqual("jenkins-ephemeral");
}); });
it('should fall back to spec.externalClusterServiceClassName when no service class', function() { it('should fall back to spec.clusterServiceClassExternalName when no service class', function() {
var result = serviceInstanceDisplayNameFilter(mockServiceInstance); var result = serviceInstanceDisplayNameFilter(mockServiceInstance);
expect(result).toEqual("jenkins-ephemeral"); expect(result).toEqual("jenkins-ephemeral");
}); });
......
test/spec/filters/serviceInstanceFailedMessageSpec.js
...@@ -12,8 +12,8 @@ describe("Filter: serviceInstanceFailedMessage", function() { ...@@ -12,8 +12,8 @@ describe("Filter: serviceInstanceFailedMessage", function() {
"uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002", "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
}, },
"spec": { "spec": {
"externalClusterServiceClassName": "mariadb-persistent", "clusterServiceClassExternalName": "mariadb-persistent",
"externalClusterServicePlanName": "default", "clusterServicePlanExternalName": "default",
"clusterServiceClassRef": { "clusterServiceClassRef": {
"name": "475554bf-aec9-11e7-8d0c-b6c718ff6445", "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
"uid": "581f692a-aec9-11e7-bae6-0242ac110002", "uid": "581f692a-aec9-11e7-bae6-0242ac110002",
......
test/spec/filters/serviceInstanceReadyMessageSpec.js
...@@ -12,7 +12,7 @@ describe("Filter: serviceInstanceReadyMessage", function() { ...@@ -12,7 +12,7 @@ describe("Filter: serviceInstanceReadyMessage", function() {
"uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002", "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
}, },
"spec": { "spec": {
"externalClusterServiceClassName": "mariadb-persistent", "clusterServiceClassExternalName": "mariadb-persistent",
"externalClusterServicePlanName": "default", "externalClusterServicePlanName": "default",
"clusterServiceClassRef": { "clusterServiceClassRef": {
"name": "475554bf-aec9-11e7-8d0c-b6c718ff6445", "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
......
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