NETOBSERV-1924 pf5 migration

config/sample-config.yaml

@@ -1105,7 +1105,6 @@ frontend:
   scopes:
     - id: cluster
       name: Cluster
-      shortName: Cl
       description: Cluster name or identifier
       labels:
         - K8S_ClusterName
@@ -1122,7 +1121,6 @@ frontend:
       stepInto: host
     - id: zone
       name: Zone
-      shortName: AZ
       description: Availability zone
       labels:
         - SrcK8S_Zone
@@ -1154,7 +1152,6 @@ frontend:
       stepInto: resource
     - id: namespace
       name: Namespace
-      shortName: NS
       description: Resource namespace
       labels:
         - SrcK8S_Namespace
@@ -1175,7 +1172,6 @@ frontend:
       stepInto: owner
     - id: owner
       name: Owner
-      shortName: Own
       description: Controller owner, such as a Deployment
       labels:
         - SrcK8S_OwnerName
@@ -1205,7 +1201,6 @@ frontend:
       stepInto: resource
     - id: resource
       name: Resource
-      shortName: Res
       description: Base resource, such as a Pod, a Service or a Node
       labels:
         - SrcK8S_Name

pkg/config/config.go

@@ -95,7 +95,6 @@ type Filter struct {
 type Scope struct {
 	ID          string   `yaml:"id" json:"id"`
 	Name        string   `yaml:"name" json:"name"`
-	ShortName   string   `yaml:"shortName" json:"shortName"`
 	Description string   `yaml:"description" json:"description"`
 	Labels      []string `yaml:"labels" json:"labels"`
 	Feature     string   `yaml:"feature,omitempty" json:"feature,omitempty"`

web/cypress/e2e/topology/topology.spec.ts

@@ -38,11 +38,11 @@ describe('netflow-topology', () => {
     cy.get('#elementPanel-drawer-body').should('exist');
     cy.get('#drawer-tabs').click();
     cy.get('.element-metrics-container').should('exist');
-    cy.get('.pf-c-chart').should('exist');
+    cy.get('.pf-v5-c-chart').should('exist');
 
     //close drawer
-    cy.get('.pf-c-drawer__close').click();
-    cy.get('.pf-c-drawer__panel-main').should('not.exist');
+    cy.get('.pf-v5-c-drawer__close').click();
+    cy.get('.pf-v5-c-drawer__panel-main').should('not.exist');
   });
 
   it('update options', () => {

web/cypress/support/commands.ts

@@ -79,7 +79,7 @@ Cypress.Commands.add('openPanelsModal', () => {
   cy.showAdvancedOptions();
   cy.get('#manage-overview-panels-button').click();
   cy.get('#overview-panels-modal').should('exist');
-  cy.get('#overview-panels-modal').find('.pf-c-data-list__item-content').should('have.length', c.availablePanelsCount);
+  cy.get('#overview-panels-modal').find('.pf-v5-c-data-list__item-content').should('have.length', c.availablePanelsCount);
 });
 
 Cypress.Commands.add('checkColumns', (groups = c.defaultColumnGroupCount, cols = c.defaultColumnCount) => {
@@ -104,13 +104,13 @@ Cypress.Commands.add('openColumnsModal', () => {
   cy.showAdvancedOptions();
   cy.get('#manage-columns-button').click();
   cy.get('#columns-modal').should('exist');
-  cy.get('#columns-modal').find('.pf-c-data-list__item-content').should('have.length', c.availableColumnCount);
+  cy.get('#columns-modal').find('.pf-v5-c-data-list__item-content').should('have.length', c.availableColumnCount);
 });
 
 Cypress.Commands.add('selectPopupItems', (id, names) => {
   for (let i = 0; i < names.length; i++) {
     cy.get(id).get('.modal-body').contains(names[i])
-      .closest('.pf-c-data-list__item-row').find('.pf-c-data-list__check').click();
+      .closest('.pf-v5-c-data-list__item-row').find('.pf-v5-c-data-list__check').click();
   }
 });
 
@@ -131,8 +131,8 @@ Cypress.Commands.add('sortColumn', (name) => {
 
 Cypress.Commands.add('dropdownSelect', (id, name) => {
   cy.get(`#${id}`).click();
-  cy.get('.pf-c-dropdown__menu').should('exist');
-  cy.get('.pf-c-dropdown__menu').find(`#${name}`).click();
+  cy.get('.pf-v5-c-menu__content').should('exist');
+  cy.get('.pf-v5-c-menu__content').find(`#${name}`).click();
 });
 
 Cypress.Commands.add('checkContent', (topology) => {
@@ -145,9 +145,9 @@ Cypress.Commands.add('checkContent', (topology) => {
 
 Cypress.Commands.add('addFilter', (filter, value, topology) => {
   cy.get('#column-filter-toggle').click();
-  cy.get('.pf-c-accordion__expanded-content-body').find(`#${filter}`).click();
-  cy.get('.pf-c-accordion__expanded-content-body').should('not.exist');
-  cy.get('#column-filter-dropdown').parent().children().eq(1).type(`${value}{enter}`);
+  cy.get('.pf-v5-c-accordion__expandable-content.pf-m-expanded').find(`#${filter}`).click();
+  cy.get('.pf-v5-c-accordion__expandable-content.pf-m-expanded').should('not.exist');
+  cy.get('input[type="search"]').type(`${value}{enter}`);
   cy.checkContent(topology);
 });
 
@@ -160,7 +160,7 @@ Cypress.Commands.add('changeQueryOption', (name, topology) => {
 
 Cypress.Commands.add('changeTimeRange', (name, topology) => {
   cy.get('#time-range-dropdown-dropdown').click();
-  cy.get('.pf-c-dropdown__menu').contains(name).click();
+  cy.get('.pf-v5-c-menu__content').contains(name).click();
   cy.checkContent(topology);
 });
 
@@ -169,7 +169,7 @@ Cypress.Commands.add('changeMetricFunction', (name) => {
   cy.showDisplayOptions();
 
   cy.get('#metricFunction-dropdown').click();
-  cy.get('.pf-c-dropdown__menu').contains(name).click();
+  cy.get('.pf-v5-c-menu__content').contains(name).click();
   cy.get('[data-layer-id="default"]').children().its('length').should('be.gte', 5);
 });
 
@@ -178,7 +178,7 @@ Cypress.Commands.add('changeMetricType', (name) => {
   cy.showDisplayOptions();
 
   cy.get('#metricType-dropdown').click();
-  cy.get('.pf-c-dropdown__menu').contains(name).click();
+  cy.get('.pf-v5-c-menu__content').contains(name).click();
   cy.get('[data-layer-id="default"]').children().its('length').should('be.gte', 5);
 });
 

web/locales/en/plugin__netobserv-plugin.json

@@ -27,6 +27,7 @@
   "Latest rate": "Latest rate",
   "Total": "Total",
   "Edge": "Edge",
+  "Unknown": "Unknown",
   "Details": "Details",
   "Metrics": "Metrics",
   "Drops": "Drops",
@@ -55,18 +56,18 @@
   "This is a partial flow: it contains only enrichment data and is missing some basic information such as byte and packet counters, TCP flags or MAC addresses. This information can likely be found in adjacent flows.": "This is a partial flow: it contains only enrichment data and is missing some basic information such as byte and packet counters, TCP flags or MAC addresses. This information can likely be found in adjacent flows.",
   "More info": "More info",
   "Raw": "Raw",
-  "JSON": "JSON",
   "Copy": "Copy",
   "Copied": "Copied",
   "3D": "3D",
   "BreadthFirst": "BreadthFirst",
   "Cola": "Cola",
+  "ColaGroups": "ColaGroups",
   "ColaNoForce": "ColaNoForce",
   "Concentric": "Concentric",
   "Dagre": "Dagre",
+  "DagreGroup": "DagreGroup",
   "Force": "Force",
   "Grid": "Grid",
-  "ColaGroups": "ColaGroups",
   "Invalid": "Invalid",
   "rate": "rate",
   "Average": "Average",
@@ -364,6 +365,7 @@
   "Show filters": "Show filters",
   "Collapse": "Collapse",
   "Expand": "Expand",
+  "Default filters": "Default filters",
   "Some filters have been automatically disabled": "Some filters have been automatically disabled",
   "Equals": "Equals",
   "Not equals": "Not equals",
@@ -397,7 +399,6 @@
   "Export view": "Export view",
   "Observe": "Observe",
   "External": "External",
-  "Unknown": "Unknown",
   "Last 5 minutes": "Last 5 minutes",
   "Last 15 minutes": "Last 15 minutes",
   "Last 30 minutes": "Last 30 minutes",