Merge from main

qiskit/providers/fake_provider/__init__.py

@@ -250,7 +250,4 @@
 from .fake_1q import Fake1Q
 from .fake_backend_v2 import FakeBackendV2, FakeBackend5QV2
 from .fake_mumbai_v2 import FakeMumbaiFractionalCX
-
-# Configurable fake backend
-from .utils.configurable_backend import ConfigurableFakeBackend
-from .fake_generic import FakeGeneric, GenericTarget
+from .generic_backend_v2 import GenericBackendV2

test/python/primitives/test_backend_estimator.py

@@ -25,16 +25,14 @@
 from qiskit.circuit import QuantumCircuit
 from qiskit.circuit.library import RealAmplitudes
 from qiskit.primitives import BackendEstimator, EstimatorResult
-from qiskit.providers import JobV1
-from qiskit.providers.fake_provider import FakeNairobi
+from qiskit.providers.fake_provider import FakeNairobi, GenericBackendV2
 from qiskit.providers.backend_compat import BackendV2Converter
-from qiskit.providers.fake_provider.fake_backend_v2 import FakeBackendSimple
 from qiskit.quantum_info import SparsePauliOp
 from qiskit.test import QiskitTestCase
 from qiskit.transpiler import PassManager
 from qiskit.utils import optionals
 
-BACKENDS = [FakeNairobi(), BackendV2Converter(FakeNairobi()), FakeBackendSimple()]
+BACKENDS = [FakeNairobi(), BackendV2Converter(FakeNairobi()), GenericBackendV2()]
 
 
 class CallbackPass(DummyAP):

test/python/primitives/test_backend_sampler.py

@@ -25,10 +25,9 @@
 from qiskit import QuantumCircuit
 from qiskit.circuit.library import RealAmplitudes
 from qiskit.primitives import BackendSampler, SamplerResult
-from qiskit.providers import JobStatus, JobV1
-from qiskit.providers.fake_provider import FakeNairobi
+from qiskit.providers import JobStatus
+from qiskit.providers.fake_provider import FakeNairobi, GenericBackendV2
 from qiskit.providers.backend_compat import BackendV2Converter
-from qiskit.providers.fake_provider.fake_backend_v2 import FakeBackendSimple
 from qiskit.providers.basicaer import QasmSimulatorPy
 from qiskit.test import QiskitTestCase
 from qiskit.transpiler import PassManager
@@ -304,7 +303,7 @@ def test_primitive_job_status_done(self, backend):
     def test_primitive_job_size_limit_backend_v2(self):
         """Test primitive respects backend's job size limit."""
 
-        class FakeBackendLimitedCircuits(FakeBackendSimple):
+        class FakeBackendLimitedCircuits(GenericBackendV2):
             """FakeBackend V2 with job size limit."""
 
             @property