X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=tests%2Ftest_controller.py;h=5bd3a08b92ce89009433437fc836f521b5db683f;hb=91ae88989c82b08b9fb69a28f838d6b80681d953;hp=680f586d8ff8e069693749097bb0409a40bc7995;hpb=5ad8f03e1fc7683bb59da31f59edc2f6c0b2372b;p=ric-plt%2Fa1.git

diff --git a/tests/test_controller.py b/tests/test_controller.py
index 680f586..5bd3a08 100644
--- a/tests/test_controller.py
+++ b/tests/test_controller.py
@@ -16,13 +16,19 @@
 # ==================================================================================
 import tempfile
 import os
+
 from rmr.rmr_mocks import rmr_mocks
 from a1 import app
-from a1 import exceptions
-from rmr import rmr
-import testing_helpers
 import pytest
 
+
+ADM_CTRL = "admission_control_policy"
+ADM_CTRL_INSTANCE = "/a1-p/policytypes/20000/policies/" + ADM_CTRL
+ADM_CTRL_INSTANCE_STATUS = ADM_CTRL_INSTANCE + "/status"
+ADM_CTRL_TYPE = "/a1-p/policytypes/20000"
+TEST_TYPE = "/a1-p/policytypes/20001"
+
+
 # http://flask.pocoo.org/docs/1.0/testing/
 @pytest.fixture
 def client():
@@ -36,43 +42,19 @@ def client():
     os.unlink(app.app.config["DATABASE"])
 
 
-def _fake_dequeue(
-    monkeypatch,
-    msg_payload={"status": "SUCCESS", "foo": "bar"},
-    msg_type=20001,
-    msg_state=0,
-    jsonb=True,
-    unexpected_first=True,
-):
+def _fake_dequeue(_filter_type):
     """
-    generates a mock rmr message response (returns a function that does; uses closures to set params)
+    for monkeypatching a1rmnr.dequeue_all_messages
     """
-    new_messages = []
-    # stick a message we don't want at the front of the queue, then stick the message we want
-    if unexpected_first:
-        monkeypatch.setattr("rmr.rmr.rmr_torcv_msg", rmr_mocks.rcv_mock_generator(msg_payload, -1, msg_state, jsonb))
-        sbuf = rmr.rmr_alloc_msg(None, None)
-        sbuf = rmr.rmr_torcv_msg(None, sbuf, None)
-        summary = rmr.message_summary(sbuf)
-        new_messages.append(summary)
-
-    monkeypatch.setattr("rmr.rmr.rmr_torcv_msg", rmr_mocks.rcv_mock_generator(msg_payload, msg_type, msg_state, jsonb))
-    sbuf = rmr.rmr_alloc_msg(None, None)
-    sbuf = rmr.rmr_torcv_msg(None, sbuf, None)
-    summary = rmr.message_summary(sbuf)
-    new_messages.append(summary)
-
-    def f():
-        return new_messages
-
-    return f
-
-
-# Actual Tests
+    fake_msg = {}
+    pay = b'{"policy_type_id": 20000, "policy_instance_id": "admission_control_policy", "handler_id": "test_receiver", "status": "OK"}'
+    fake_msg["payload"] = pay
+    new_messages = [fake_msg]
+    return new_messages
 
 
 def _test_put_patch(monkeypatch):
-    testing_helpers.patch_all(monkeypatch)
+    rmr_mocks.patch_rmr(monkeypatch)
     monkeypatch.setattr("rmr.rmr.rmr_send_msg", rmr_mocks.send_mock_generator(0))  # good sends for this whole batch
 
     # we need to repatch alloc (already patched in patch_rmr) to fix the transactionid, alloc is called in send and recieve
@@ -90,117 +72,127 @@ def _test_put_patch(monkeypatch):
     monkeypatch.setattr("rmr.rmr.generate_and_set_transaction_id", fake_set_transactionid)
 
 
-def test_xapp_put_bad(client, monkeypatch):
-    """Test policy put fails"""
-    _test_put_patch(monkeypatch)
-    # return from policy handler has a status indicating FAIL
-    monkeypatch.setattr(
-        "a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload={"status": "FAIL", "foo": "bar"})
-    )
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 502
-    assert res.json["reason"] == "BAD STATUS"
-    assert res.json["return_payload"] == {"status": "FAIL", "foo": "bar"}
-
-    # return from policy handler has no status field
-    monkeypatch.setattr("a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload={"foo": "bar"}))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 502
-    assert res.json["reason"] == "NO STATUS"
-    assert res.json["return_payload"] == {"foo": "bar"}
-
-    # return from policy handler not a json
-    monkeypatch.setattr(
-        "a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload="booger", jsonb=False)
-    )
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 502
-    assert res.json["reason"] == "NOT JSON"
-    assert res.json["return_payload"] == "booger"
-
-    # bad type
-    monkeypatch.setattr("a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_type=666))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 504
-    assert res.data == b"\"A1 was expecting an ACK back but it didn't receive one or didn't recieve the expected ACK\"\n"
-
-    # bad state
-    monkeypatch.setattr("a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_state=666))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 504
-    assert res.data == b"\"A1 was expecting an ACK back but it didn't receive one or didn't recieve the expected ACK\"\n"
-
-
-def test_xapp_put_good(client, monkeypatch):
-    """ test policy put good"""
-    _test_put_patch(monkeypatch)
+# Actual Tests
 
-    # do a good one
-    monkeypatch.setattr("a1.a1rmr._dequeue_all_waiting_messages", _fake_dequeue(monkeypatch))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 200
-    assert res.json == {"status": "SUCCESS", "foo": "bar"}
 
+def test_xapp_put_good(client, monkeypatch, adm_type_good, adm_instance_good):
+    """ test policy put good"""
 
-def test_xapp_put_bad_send(client, monkeypatch):
-    """
-    Test bad send failures
-    """
-    testing_helpers.patch_all(monkeypatch)
+    # no type there yet
+    res = client.get(ADM_CTRL_TYPE)
+    assert res.status_code == 404
 
-    monkeypatch.setattr("rmr.rmr.rmr_send_msg", rmr_mocks.send_mock_generator(10))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 504
-    assert res.data == b'"A1 was unable to send a needed message to a downstream subscriber"\n'
+    # put the type
+    res = client.put(ADM_CTRL_TYPE, json=adm_type_good)
+    assert res.status_code == 201
 
-    monkeypatch.setattr("rmr.rmr.rmr_send_msg", rmr_mocks.send_mock_generator(5))
-    res = client.put("/ric/policies/control_admission_time", json=testing_helpers.good_payload())
-    assert res.status_code == 504
-    assert res.data == b'"A1 was unable to send a needed message to a downstream subscriber"\n'
+    # there now
+    res = client.get(ADM_CTRL_TYPE)
+    assert res.status_code == 200
+    assert res.json == adm_type_good
 
+    # no instance there yet
+    res = client.get(ADM_CTRL_INSTANCE)
+    assert res.status_code == 404
+    res = client.get(ADM_CTRL_INSTANCE_STATUS)
+    assert res.status_code == 404
 
-def test_bad_requests(client, monkeypatch):
-    """Test bad requests"""
-    testing_helpers.patch_all(monkeypatch)
+    # create a good instance
+    _test_put_patch(monkeypatch)
+    res = client.put(ADM_CTRL_INSTANCE, json=adm_instance_good)
+    assert res.status_code == 201
 
-    # test a 404
-    res = client.put("/ric/policies/noexist", json=testing_helpers.good_payload())
-    assert res.status_code == 404
+    # get the instance
+    res = client.get(ADM_CTRL_INSTANCE)
+    assert res.status_code == 200
+    assert res.json == adm_instance_good
 
-    # bad media type
-    res = client.put("/ric/policies/control_admission_time", data="notajson")
-    assert res.status_code == 415
+    # get the instance status
+    monkeypatch.setattr("a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue)
+    res = client.get(ADM_CTRL_INSTANCE_STATUS)
+    assert res.status_code == 200
+    assert res.json == [{"handler_id": "test_receiver", "status": "OK"}]
 
-    # test a PUT body against a poliucy not expecting one
-    res = client.put("/ric/policies/test_policy", json=testing_helpers.good_payload())
-    assert res.status_code == 400
-    assert res.data == b'"BODY SUPPLIED BUT POLICY HAS NO EXPECTED BODY"\n'
+    # assert that rmr bad states don't cause problems
+    monkeypatch.setattr("rmr.rmr.rmr_send_msg", rmr_mocks.send_mock_generator(10))
+    res = client.put(ADM_CTRL_INSTANCE, json=adm_instance_good)
+    assert res.status_code == 201
+
+    monkeypatch.setattr("rmr.rmr.rmr_send_msg", rmr_mocks.send_mock_generator(5))
+    res = client.put(ADM_CTRL_INSTANCE, json=adm_instance_good)
+    assert res.status_code == 201
+
+
+# def test_xapp_put_bad(client, monkeypatch):
+#     """Test policy put fails"""
+#     _test_put_patch(monkeypatch)
+#     # return from policy handler has a status indicating FAIL
+#     monkeypatch.setattr(
+#         "a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload={"status": "FAIL", "foo": "bar"})
+#     )
+#     res = client.put("/a1-p/policies/admission_control_policy", json=testing_helpers.good_payload())
+#     assert res.status_code == 502
+#     assert res.json["reason"] == "BAD STATUS"
+#     assert res.json["return_payload"] == {"status": "FAIL", "foo": "bar"}
+#
+#     # return from policy handler has no status field
+#     monkeypatch.setattr("a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload={"foo": "bar"}))
+#     res = client.put("/a1-p/policies/admission_control_policy", json=testing_helpers.good_payload())
+#     assert res.status_code == 502
+#     assert res.json["reason"] == "NO STATUS"
+#     assert res.json["return_payload"] == {"foo": "bar"}
+#
+#     # return from policy handler not a json
+#     monkeypatch.setattr(
+#         "a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_payload="booger", jsonb=False)
+#     )
+#     res = client.put("/a1-p/policies/admission_control_policy", json=testing_helpers.good_payload())
+#     assert res.status_code == 502
+#     assert res.json["reason"] == "NOT JSON"
+#     assert res.json["return_payload"] == "booger"
+#
+#     # bad type
+#     monkeypatch.setattr("a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_type=666))
+#     res = client.put("/a1-p/policies/admission_control_policy", json=testing_helpers.good_payload())
+#     assert res.status_code == 504
+#     assert res.data == b"\"A1 was expecting an ACK back but it didn't receive one or didn't recieve the expected ACK\"\n"
+#
+#     # bad state
+#     monkeypatch.setattr("a1.a1rmr.dequeue_all_waiting_messages", _fake_dequeue(monkeypatch, msg_state=666))
+#     res = client.put("/a1-p/policies/admission_control_policy", json=testing_helpers.good_payload())
+#     assert res.status_code == 504
+#     assert res.data == b"\"A1 was expecting an ACK back but it didn't receive one or didn't recieve the expected ACK\"\n"
 
 
-def test_missing_manifest(client, monkeypatch):
+def test_bad_instances(client, monkeypatch, adm_type_good):
     """
-    test that we get a 500 with an approrpiate message on a missing manifest
+    Test bad send failures
     """
+    rmr_mocks.patch_rmr(monkeypatch)
 
-    def f():
-        raise exceptions.MissingManifest()
+    # TODO: reenable this after delete!
+    # put the type
+    # res = client.put(ADM_CTRL_TYPE, json=adm_type_good)
+    # assert res.status_code == 201
 
-    monkeypatch.setattr("a1.utils.get_ric_manifest", f)
+    # illegal type range
+    res = client.put("/a1-p/policytypes/19999", json=adm_type_good)
+    assert res.status_code == 400
+    res = client.put("/a1-p/policytypes/21024", json=adm_type_good)
+    assert res.status_code == 400
 
-    res = client.put(
-        "/ric/policies/control_admission_time", json=testing_helpers.good_payload(), headers={"Content-Type": "text/plain"}
-    )
-    assert res.status_code == 500
-    assert res.data == b'"A1 was unable to find the required RIC manifest. report this!"\n'
+    # bad body
+    res = client.put(ADM_CTRL_INSTANCE, json={"not": "expected"})
+    assert res.status_code == 400
 
+    # bad media type
+    res = client.put(ADM_CTRL_INSTANCE, data="notajson")
+    assert res.status_code == 415
 
-def test_missing_rmr(client, monkeypatch):
+
+def test_healthcheck(client):
     """
-    test that we get a 500 with an approrpiate message on a missing rmr rmr_string
+    test healthcheck
     """
-    testing_helpers.patch_all(monkeypatch, nonexisting_rmr=True)
-    res = client.put(
-        "/ric/policies/control_admission_time", json=testing_helpers.good_payload(), headers={"Content-Type": "text/plain"}
-    )
-    assert res.status_code == 500
-    assert res.data == b'"A1 does not have a mapping for the desired rmr string. report this!"\n'
+    res = client.get("/a1-p/healthcheck")
+    assert res.status_code == 200