Match VM Services against all labels (kubevirt#305)

Author: rawagner

src/components/Details/Services/fixtures/Services.fixture.js

@@ -5,9 +5,15 @@ import { Services } from '../Services';
 import { TEMPLATE_VM_NAME_LABEL } from '../../../../constants';
 
 const vm = {
-  metadata: {
-    name: 'my-vm',
-    namespace: 'my-namespace',
+  spec: {
+    template: {
+      metadata: {
+        labels: {
+          [TEMPLATE_VM_NAME_LABEL]: 'my-vm',
+          fooSelector: 'fooValue',
+        },
+      },
+    },
   },
 };
 
@@ -29,6 +35,7 @@ export const services = [
     spec: {
       selector: {
         [TEMPLATE_VM_NAME_LABEL]: 'my-vm',
+        fooSelector: 'fooValue',
       },
     },
   },
@@ -42,6 +49,18 @@ export const services = [
       },
     },
   },
+  {
+    metadata: {
+      name: 'fooService3',
+    },
+    spec: {
+      selector: {
+        [TEMPLATE_VM_NAME_LABEL]: 'my-vm',
+        fooSelector: 'fooValue',
+        anotherFooSelector: 'fooValue',
+      },
+    },
+  },
 ];
 
 export const ResourceLinkComponent = ({ name }) => (

src/components/Details/VmDetails/fixtures/VmDetails.fixture.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { VmDetails } from '../VmDetails';
-import { LABEL_USED_TEMPLATE_NAME, LABEL_USED_TEMPLATE_NAMESPACE } from '../../../../constants';
+import { LABEL_USED_TEMPLATE_NAME, LABEL_USED_TEMPLATE_NAMESPACE, TEMPLATE_VM_NAME_LABEL } from '../../../../constants';
 import { k8sPatch, k8sGet } from '../../../../tests/k8s';
 import { services, ResourceLinkComponent } from '../../Services/fixtures/Services.fixture';
 
@@ -154,6 +154,21 @@ export const vmFixtures = {
     },
     spec: { running: false },
   },
+  vmWithVmiLabels: {
+    metadata: {
+      ...metadata,
+    },
+    spec: {
+      template: {
+        metadata: {
+          labels: {
+            [TEMPLATE_VM_NAME_LABEL]: 'my-vm',
+            fooSelector: 'fooValue',
+          },
+        },
+      },
+    },
+  },
 };
 
 const vmiFixture = {
@@ -269,7 +284,7 @@ export default [
     component: VmDetails,
     name: 'VM with services',
     props: {
-      vm: vmFixtures.downVm,
+      vm: vmFixtures.vmWithVmiLabels,
       k8sPatch,
       k8sGet,
       NodeLink: () => true,

src/components/Details/VmDetails/tests/VmDetails.test.js

@@ -64,7 +64,7 @@ describe('<VmDetails />', () => {
   });
 
   it('renders correctly with services', () => {
-    const component = render(testVmDetails(vmFixtures.downVm, { services }));
+    const component = render(testVmDetails(vmFixtures.vmWithVmiLabels, { services }));
     expect(component).toMatchSnapshot();
   });
 

src/selectors/service/combined.js

@@ -1,7 +1,11 @@
-import { get } from 'lodash';
+import { getVmiTemplateLabels } from '../vm/selectors';
+import { getServiceSelectors } from './selectors';
 
-import { TEMPLATE_VM_NAME_LABEL } from '../../constants';
-import { getName } from '../common';
-
-export const getServicesForVm = (services, vm) =>
-  services.filter(service => get(service, ['spec', 'selector', TEMPLATE_VM_NAME_LABEL]) === getName(vm));
+export const getServicesForVm = (services, vm) => {
+  const vmLabels = getVmiTemplateLabels(vm);
+  return services.filter(service => {
+    const selectors = getServiceSelectors(service);
+    const selectorKeys = Object.keys(selectors);
+    return selectorKeys.length > 0 ? selectorKeys.every(key => vmLabels[key] === selectors[key]) : false;
+  });
+};

src/selectors/service/index.js

@@ -1 +1,2 @@
 export * from './combined';
+export * from './selectors';

src/selectors/service/selectors.js

@@ -0,0 +1,3 @@
+import { get } from 'lodash';
+
+export const getServiceSelectors = service => get(service, 'spec.selector', {});

src/selectors/vm/selectors.js

@@ -89,3 +89,5 @@ export const getInterfaceBinding = intface => {
   }
   return null;
 };
+
+export const getVmiTemplateLabels = vm => get(vm, 'spec.template.metadata.labels', {});