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

Adopt renamed service external name properies

dist/origin-web-common-services.js

@@ -1312,7 +1312,7 @@ angular.module("openshiftCommonServices")
       return _.sortBy(serviceInstances,
         function(item) {
           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) {
           return _.get(item, 'metadata.name', '');

dist/origin-web-common-ui.js

@@ -1819,9 +1819,9 @@ angular.module('openshiftCommonUI')
         return serviceClassDisplayNameFilter(serviceClass);
       }
 
-      var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName');
-      if (externalServiceClassName) {
-        return externalServiceClassName;
+      var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
       }
 
       return _.get(instance, 'metadata.name');

dist/origin-web-common.js

@@ -2014,9 +2014,9 @@ angular.module('openshiftCommonUI')
         return serviceClassDisplayNameFilter(serviceClass);
       }
 
-      var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName');
-      if (externalServiceClassName) {
-        return externalServiceClassName;
+      var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
       }
 
       return _.get(instance, 'metadata.name');
@@ -3336,7 +3336,7 @@ angular.module("openshiftCommonServices")
       return _.sortBy(serviceInstances,
         function(item) {
           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) {
           return _.get(item, 'metadata.name', '');

dist/origin-web-common.min.js

@@ -897,8 +897,8 @@ return serviceClassDisplayName ? serviceClassDisplayName :_.get(serviceClass, "s
 }).filter("serviceInstanceDisplayName", [ "serviceClassDisplayNameFilter", function(serviceClassDisplayNameFilter) {
 return function(instance, serviceClass) {
 if (serviceClass) return serviceClassDisplayNameFilter(serviceClass);
-var externalServiceClassName = _.get(instance, "spec.externalClusterServiceClassName");
-return externalServiceClassName ? externalServiceClassName :_.get(instance, "metadata.name");
+var serviceClassExternalName = _.get(instance, "spec.clusterServiceClassExternalName");
+return serviceClassExternalName ? serviceClassExternalName :_.get(instance, "metadata.name");
 };
 } ]).filter("serviceInstanceStatus", [ "isServiceInstanceReadyFilter", function(isServiceInstanceReadyFilter) {
 return function(instance) {
@@ -1467,7 +1467,7 @@ return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], serv
 }, sortServiceInstances = function(serviceInstances, serviceClasses) {
 return serviceInstances || serviceClasses ? _.sortBy(serviceInstances, function(item) {
 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) {
 return _.get(item, "metadata.name", "");
 }) :null;

src/filters/resources.js

@@ -190,9 +190,9 @@ angular.module('openshiftCommonUI')
         return serviceClassDisplayNameFilter(serviceClass);
       }
 
-      var externalServiceClassName = _.get(instance, 'spec.externalClusterServiceClassName');
-      if (externalServiceClassName) {
-        return externalServiceClassName;
+      var serviceClassExternalName = _.get(instance, 'spec.clusterServiceClassExternalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
       }
 
       return _.get(instance, 'metadata.name');

src/services/bindService.js

@@ -195,7 +195,7 @@ angular.module("openshiftCommonServices")
       return _.sortBy(serviceInstances,
         function(item) {
           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) {
           return _.get(item, 'metadata.name', '');

test/spec/filters/isServiceInstanceFailedSpec.js

@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceFailed", function() {
       "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
     },
     "spec": {
-      "externalClusterServiceClassName": "mariadb-persistent",
-      "externalClusterServicePlanName": "default",
+      "clusterServiceClassExternalName": "mariadb-persistent",
+      "clusterServicePlanExternalName": "default",
       "clusterServiceClassRef": {
         "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
         "uid": "581f692a-aec9-11e7-bae6-0242ac110002",

test/spec/filters/isServiceInstanceReadySpec.js

@@ -12,8 +12,8 @@ describe("Filter: isServiceInstanceReady", function() {
       "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
     },
     "spec": {
-      "externalClusterServiceClassName": "mariadb-persistent",
-      "externalClusterServicePlanName": "default",
+      "clusterServiceClassExternalName": "mariadb-persistent",
+      "clusterServicePlanExternalName": "default",
       "clusterServiceClassRef": {
         "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
         "uid": "581f692a-aec9-11e7-bae6-0242ac110002",

test/spec/filters/serviceInstanceDisplayNameSpec.js

@@ -23,7 +23,7 @@ describe("Filter: serviceInstanceDisplayName", function() {
       name: 'jenkins-ephemeral-2jk9x'
     },
     spec: {
-      externalClusterServiceClassName: 'jenkins-ephemeral'
+      clusterServiceClassExternalName: 'jenkins-ephemeral'
     }
   };
 
@@ -43,7 +43,7 @@ describe("Filter: serviceInstanceDisplayName", function() {
     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);
     expect(result).toEqual("jenkins-ephemeral");
   });

test/spec/filters/serviceInstanceFailedMessageSpec.js

@@ -12,8 +12,8 @@ describe("Filter: serviceInstanceFailedMessage", function() {
       "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
     },
     "spec": {
-      "externalClusterServiceClassName": "mariadb-persistent",
-      "externalClusterServicePlanName": "default",
+      "clusterServiceClassExternalName": "mariadb-persistent",
+      "clusterServicePlanExternalName": "default",
       "clusterServiceClassRef": {
         "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",
         "uid": "581f692a-aec9-11e7-bae6-0242ac110002",

test/spec/filters/serviceInstanceReadyMessageSpec.js

@@ -12,7 +12,7 @@ describe("Filter: serviceInstanceReadyMessage", function() {
       "uid": "6a31b3ce-aec9-11e7-bae6-0242ac110002",
     },
     "spec": {
-      "externalClusterServiceClassName": "mariadb-persistent",
+      "clusterServiceClassExternalName": "mariadb-persistent",
       "externalClusterServicePlanName": "default",
       "clusterServiceClassRef": {
         "name": "475554bf-aec9-11e7-8d0c-b6c718ff6445",