From 787c37693c30b78269a6b019cbe240ecf6f6cb0e Mon Sep 17 00:00:00 2001 From: Oleksandr Zharov Date: Wed, 13 Dec 2023 16:01:11 +0100 Subject: [PATCH] Remove variables for genius Removed variables for genius project and cleaned up code after. JIRA: INTTEST-140 Change-Id: I36e22fe0be68c3d71622c50d56801942a570ff48 Signed-off-by: Oleksandr Zharov --- csit/libraries/Coe.robot | 2 -- csit/scripts/set_itm_direct_tunnels.sh | 23 ------------ .../bgpcep/bgpfunct/bgp_ipv6_basic.robot | 1 - .../aclservicerecovery.robot | 3 -- csit/suites/netvirt/upgrade/upgrade.robot | 1 - csit/variables/Variables.robot | 4 --- .../genius/Itm_Auto_Tunnel_Create.json | 8 ----- .../Itm_creation_no_vlan_below_sodium.json | 32 ----------------- ...Itm_creation_no_vlan_sodium_and_above.json | 25 ------------- csit/variables/genius/Modules.py | 36 ------------------- csit/variables/genius/allocateIdRange.json | 7 ---- csit/variables/genius/bind_service.json | 34 ------------------ csit/variables/genius/createIdpool.json | 7 ---- csit/variables/genius/deleteIdPool.json | 5 --- csit/variables/genius/l2vlan.json | 11 ------ csit/variables/genius/l2vlan_member.json | 12 ------- csit/variables/genius/releaseIds.json | 6 ---- csit/variables/netvirt/Variables.robot | 1 - tools/distchanges/changes.py | 1 - tools/distchanges/distcompare.py | 1 - tools/distchanges/tests/test_changes.py | 1 - 21 files changed, 221 deletions(-) delete mode 100644 csit/scripts/set_itm_direct_tunnels.sh delete mode 100644 csit/variables/genius/Itm_Auto_Tunnel_Create.json delete mode 100644 csit/variables/genius/Itm_creation_no_vlan_below_sodium.json delete mode 100644 csit/variables/genius/Itm_creation_no_vlan_sodium_and_above.json delete mode 100644 csit/variables/genius/Modules.py delete mode 100644 csit/variables/genius/allocateIdRange.json delete mode 100644 csit/variables/genius/bind_service.json delete mode 100644 csit/variables/genius/createIdpool.json delete mode 100644 csit/variables/genius/deleteIdPool.json delete mode 100644 csit/variables/genius/l2vlan.json delete mode 100644 csit/variables/genius/l2vlan_member.json delete mode 100644 csit/variables/genius/releaseIds.json diff --git a/csit/libraries/Coe.robot b/csit/libraries/Coe.robot index 40853635c9..5e7b45c52e 100644 --- a/csit/libraries/Coe.robot +++ b/csit/libraries/Coe.robot @@ -3,7 +3,6 @@ Library BuiltIn Library SSHLibrary Library String Resource DataModels.robot -Resource Genius.robot Resource OVSDB.robot Resource SSHKeywords.robot Resource Utils.robot @@ -54,7 +53,6 @@ Start Suite ... 2 ... ClusterManagement.Check Status Of Services Is OPERATIONAL ... @{COE_DIAG_SERVICES} - BuiltIn.Wait Until Keyword Succeeds 85 2 Genius.Verify Tunnel Status As Up Set Connection ids and Bridge [Documentation] Sets the connection ids for all the nodes and get the bridge from configuration file . diff --git a/csit/scripts/set_itm_direct_tunnels.sh b/csit/scripts/set_itm_direct_tunnels.sh deleted file mode 100644 index 4d6f3b3d44..0000000000 --- a/csit/scripts/set_itm_direct_tunnels.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -ENABLE_ITM_DIRECT_TUNNELS=${ENABLE_ITM_DIRECT_TUNNELS:-false} - -cat > ${WORKSPACE}/set_itm_direct_tunnels.sh <false/itm-direct-tunnels>${ENABLE_ITM_DIRECT_TUNNELS}/g' /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/genius-ifm-config.xml - cat /tmp/${BUNDLEFOLDER}/etc/opendaylight/datastore/initial/config/genius-ifm-config.xml - -EOF - -echo "Copying config files to ODL Controller folder" -for i in `seq 1 ${NUM_ODL_SYSTEM}` -do - CONTROLLERIP=ODL_SYSTEM_${i}_IP - echo "Setting itm-direct-tunnels to ${ENABLE_ITM_DIRECT_TUNNELS} on ${!CONTROLLERIP}" - scp ${WORKSPACE}/set_itm_direct_tunnels.sh ${!CONTROLLERIP}:/tmp/ - ssh ${!CONTROLLERIP} 'bash /tmp/set_itm_direct_tunnels.sh' - -done diff --git a/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot b/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot index f9f70f466f..6d0c726342 100644 --- a/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot +++ b/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot @@ -20,7 +20,6 @@ Library RequestsLibrary Library SSHLibrary Resource ../../../libraries/BGPcliKeywords.robot Resource ../../../libraries/ExaBgpLib.robot -Resource ../../../libraries/Genius.robot Resource ../../../libraries/SetupUtils.robot Resource ../../../libraries/SSHKeywords.robot Resource ../../../libraries/TemplatedRequests.robot diff --git a/csit/suites/netvirt/aclservicerecovery/aclservicerecovery.robot b/csit/suites/netvirt/aclservicerecovery/aclservicerecovery.robot index bf36eb9d73..1e8197e74b 100644 --- a/csit/suites/netvirt/aclservicerecovery/aclservicerecovery.robot +++ b/csit/suites/netvirt/aclservicerecovery/aclservicerecovery.robot @@ -9,7 +9,6 @@ Library OperatingSystem Library RequestsLibrary Library String Resource ../../../libraries/DevstackUtils.robot -Resource ../../../libraries/Genius.robot Resource ../../../libraries/KarafKeywords.robot Resource ../../../libraries/OVSDB.robot Resource ../../../libraries/OvsManager.robot @@ -37,8 +36,6 @@ ${acl_sr_security_group} acl_sr_sg ${TEST_LOG_LEVEL} trace @{TEST_LOG_COMPONENTS} ... org.opendaylight.netvirt.aclservice -... org.opendaylight.genius.interfacemanager -... org.opendaylight.genius.srm *** Test Cases *** diff --git a/csit/suites/netvirt/upgrade/upgrade.robot b/csit/suites/netvirt/upgrade/upgrade.robot index 5a5ea95307..b73443f9a8 100644 --- a/csit/suites/netvirt/upgrade/upgrade.robot +++ b/csit/suites/netvirt/upgrade/upgrade.robot @@ -33,7 +33,6 @@ ${PASSIVE_MANAGER} ptcp:6641:127.0.0.1 ... org.opendaylight.ovsdb ... org.opendaylight.ovsdb.lib ... org.opendaylight.netvirt -... org.opendaylight.genius ${UPDATE_FLAG_PATH} /restconf/config/odl-serviceutils-upgrade:upgrade-config ${GET_ACTIVE_BUNDLE_URI} /restconf/operations/arbitrator-reconcile:get-active-bundle ${COMMIT_ACTIVE_BUNDLE_URI} /restconf/operations/arbitrator-reconcile:commit-active-bundle diff --git a/csit/variables/Variables.robot b/csit/variables/Variables.robot index 1f9ed046d4..a3f4ffe0c7 100644 --- a/csit/variables/Variables.robot +++ b/csit/variables/Variables.robot @@ -202,10 +202,6 @@ ${GBP_TUNNELS_API} # FIXME: Move to a separate GroupBasedPolicy-related Resource and add description. ${GBP_UNREGEP_API} ... /restconf/operations/endpoint:unregister-endpoint -${GENIUS_IFM_CONFIG_FLAG} -... ${KARAF_HOME}/etc/opendaylight/datastore/initial/config/genius-ifm-config.xml -${GENIUS_ITM_CONFIG_FLAG} -... ${KARAF_HOME}/etc/opendaylight/datastore/initial/config/genius-itm-config.xml # FIXME: Move to a separate Centinel-related Resource and add description. ${GET_CONFIGURATION_URI} ... /restconf/operational/configuration:configurationRecord/ diff --git a/csit/variables/genius/Itm_Auto_Tunnel_Create.json b/csit/variables/genius/Itm_Auto_Tunnel_Create.json deleted file mode 100644 index 576377395e..0000000000 --- a/csit/variables/genius/Itm_Auto_Tunnel_Create.json +++ /dev/null @@ -1,8 +0,0 @@ -{"transport-zone": [ - { - "zone-name": "TZA", - "tunnel-type": "odl-interface:tunnel-type-vxlan" - - } - ] -} diff --git a/csit/variables/genius/Itm_creation_no_vlan_below_sodium.json b/csit/variables/genius/Itm_creation_no_vlan_below_sodium.json deleted file mode 100644 index f589fdd728..0000000000 --- a/csit/variables/genius/Itm_creation_no_vlan_below_sodium.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "transport-zone": [ - { - "subnets": [ - { - "gateway-ip": "0.0.0.0", - "prefix": "1.1.1.1/16", - "vlan-id": 0, - "vteps": [ - { - "dpn-id": 100, - "ip-address": "2.2.2.2", - "portname": "br-int-eth1" - }, - { - "dpn-id": 101, - "ip-address": "3.3.3.3", - "portname": "br-int-eth1" - }, - { - "dpn-id": 102, - "ip-address": "4.4.4.4", - "portname": "br-int-eth1" - } - ] - } - ], - "tunnel-type": "odl-interface:tunnel-type-vxlan", - "zone-name": "TZA" - } - ] -} diff --git a/csit/variables/genius/Itm_creation_no_vlan_sodium_and_above.json b/csit/variables/genius/Itm_creation_no_vlan_sodium_and_above.json deleted file mode 100644 index 8a2a2b777e..0000000000 --- a/csit/variables/genius/Itm_creation_no_vlan_sodium_and_above.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "transport-zone": [ - { - "tunnel-type": "odl-interface:tunnel-type-vxlan", - "vteps": [ - { - "dpn-id": 100, - "ip-address": "2.2.2.2", - "option-of-tunnel": false - }, - { - "dpn-id": 101, - "ip-address": "3.3.3.3", - "option-of-tunnel": false - }, - { - "dpn-id": 102, - "ip-address": "4.4.4.4", - "option-of-tunnel": false - } - ], - "zone-name": "TZA" - } - ] -} diff --git a/csit/variables/genius/Modules.py b/csit/variables/genius/Modules.py deleted file mode 100644 index 862402b992..0000000000 --- a/csit/variables/genius/Modules.py +++ /dev/null @@ -1,36 +0,0 @@ -data_models = [ - "config/ietf-interfaces:interfaces", - "config/interface-service-bindings:service-bindings", - "config/itm:transport-zones", - "config/itm-config:tunnel-monitor-enabled", - "config/itm-config:tunnel-monitor-interval", - "config/itm-config:tunnel-monitor-params", - "config/itm-state:dpn-endpoints", - "config/itm-state:dpn-teps-state", - "config/itm-state:external-tunnel-list", - "config/itm-state:tunnel-list", - "config/network-topology:network-topology/topology/ovsdb:1", - "config/odl-interface-meta:bridge-interface-info", - "config/odl-interface-meta:interface-child-info", - "config/odl-itm-meta:bridge-tunnel-info", - "config/opendaylight-inventory:nodes", - "operational/ietf-interfaces:interfaces-state", - "operational/interface-service-bindings:bound-services-state-list", - "operational/itm-config:tunnel-monitor-enabled", - "operational/itm-config:tunnel-monitor-interval", - "operational/itm-config:tunnel-monitor-params", - "operational/itm-state:tunnels_state", - "operational/network-topology:network-topology/topology/ovsdb:1", - "operational/odl-interface-meta:bridge-ref-info", - "operational/odl-interface-meta:dpn-to-interface-list", - "operational/odl-interface-meta:if-indexes-interface-map", - "operational/odl-itm-meta:dpn-to-interface-list", - "operational/odl-itm-meta:if-indexes-tunnel-map", - "operational/odl-itm-meta:ovs-bridge-ref-info", - "operational/opendaylight-inventory:nodes", -] - -idmanager_data_models = [ - "config/id-manager:id-pools/", - "operational/lock-manager:locks/", -] diff --git a/csit/variables/genius/allocateIdRange.json b/csit/variables/genius/allocateIdRange.json deleted file mode 100644 index 2edf74442d..0000000000 --- a/csit/variables/genius/allocateIdRange.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "input": { - "id-manager:pool-name": "test-pool", - "id-manager:id-key": "test-key", - "id-manager:size": 5 - } -} diff --git a/csit/variables/genius/bind_service.json b/csit/variables/genius/bind_service.json deleted file mode 100644 index 4f0bf513f2..0000000000 --- a/csit/variables/genius/bind_service.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "bound-services": [ - { - "flow-cookie": "1", - "flow-priority": "5", - "instruction": [ - { - "go-to-table": { - "table_id": 21 - }, - "order": 1 - } - ], - "service-name": "service1", - "service-priority": "3", - "service-type": "service-type-flow-based" - }, - { - "flow-cookie": "1", - "flow-priority": "5", - "instruction": [ - { - "go-to-table": { - "table_id": 50 - }, - "order": 1 - } - ], - "service-name": "service2", - "service-priority": "4", - "service-type": "service-type-flow-based" - } - ] -} diff --git a/csit/variables/genius/createIdpool.json b/csit/variables/genius/createIdpool.json deleted file mode 100644 index 310e1cad43..0000000000 --- a/csit/variables/genius/createIdpool.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "input": { - "id-manager:pool-name": "test-pool", - "id-manager:low": 10, - "id-manager:high": 20 - } -} \ No newline at end of file diff --git a/csit/variables/genius/deleteIdPool.json b/csit/variables/genius/deleteIdPool.json deleted file mode 100644 index 7ef25a35ee..0000000000 --- a/csit/variables/genius/deleteIdPool.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "input": { - "id-manager:pool-name": "poolname" - } -} diff --git a/csit/variables/genius/l2vlan.json b/csit/variables/genius/l2vlan.json deleted file mode 100644 index c8425de751..0000000000 --- a/csit/variables/genius/l2vlan.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "interface": [ - { - "name": "l2vlan-trunk", - "type": "iana-if-type:l2vlan", - "l2vlan-mode":"trunk", - "odl-interface:parent-interface": "tap0ed70586-6c", - "enabled": "true" - } - ] -} diff --git a/csit/variables/genius/l2vlan_member.json b/csit/variables/genius/l2vlan_member.json deleted file mode 100644 index 50f8768fb0..0000000000 --- a/csit/variables/genius/l2vlan_member.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "interface": [ - { - "enabled": "true", - "l2vlan-mode": "trunk-member", - "name": "l2vlan-trunk1", - "odl-interface:parent-interface": "l2vlan-trunk", - "type": "iana-if-type:l2vlan", - "vlan-id": 1000 - } - ] -} diff --git a/csit/variables/genius/releaseIds.json b/csit/variables/genius/releaseIds.json deleted file mode 100644 index 9f242b4dfd..0000000000 --- a/csit/variables/genius/releaseIds.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "input": { - "id-manager:id-key": "test-key", - "id-manager:pool-name": "test-pool" - } -} diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot index b80463f3fd..c1e8b6b371 100644 --- a/csit/variables/netvirt/Variables.robot +++ b/csit/variables/netvirt/Variables.robot @@ -111,5 +111,4 @@ ${EGRESS_LEARN_ACL_FILTER_TABLE} 244 ... 216 217 239 240 241 242 243 ... 244 245 246 247 ${TRANSPORT_ZONE_ENDPOINT_URL} ${CONFIG_API}/itm:transport-zones/transport-zone -${GENIUS_VAR_DIR} ${CURDIR}/../../variables/genius ${TEP_NOT_HOSTED_ZONE_URL} ${OPERATIONAL_API}/itm:not-hosted-transport-zones diff --git a/tools/distchanges/changes.py b/tools/distchanges/changes.py index 4deca8d3f0..02c5c0f7ed 100644 --- a/tools/distchanges/changes.py +++ b/tools/distchanges/changes.py @@ -70,7 +70,6 @@ class Changes(object): "controller", "dlux", "dluxapps", - "genius", "infrautils", "mdsal", "netconf", diff --git a/tools/distchanges/distcompare.py b/tools/distchanges/distcompare.py index ce6f951cfe..cc35067440 100644 --- a/tools/distchanges/distcompare.py +++ b/tools/distchanges/distcompare.py @@ -45,7 +45,6 @@ class DistCompare(object): "dluxapps", "coe", "packetcable", - "genius", "yangtools", "infrautils", "netvirt", diff --git a/tools/distchanges/tests/test_changes.py b/tools/distchanges/tests/test_changes.py index df2208a128..fbc0cd45f1 100644 --- a/tools/distchanges/tests/test_changes.py +++ b/tools/distchanges/tests/test_changes.py @@ -12,7 +12,6 @@ NETVIRT_PROJECTS = [ "controller", "dlux", "dluxapps", - "genius", "infrautils", "mdsal", "netconf", -- 2.36.6