X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=near-rt-ric-simulator%2Fsrc%2FSTD_1.1.3%2Fa1.py;fp=near-rt-ric-simulator%2Fsrc%2FSTD_1.1.3%2Fa1.py;h=23f405a784ed6ca981ac9fbf03293aef5fd80bbe;hb=24ee2701e54884c8fc2ed7e6cf522d71286a3b33;hp=d7169b19e81b63e076ea82243f01958005dd17aa;hpb=59e2b2abfe0474acacb44a2922bfaf01b26bfa06;p=sim%2Fa1-interface.git diff --git a/near-rt-ric-simulator/src/STD_1.1.3/a1.py b/near-rt-ric-simulator/src/STD_1.1.3/a1.py index d7169b1..23f405a 100644 --- a/near-rt-ric-simulator/src/STD_1.1.3/a1.py +++ b/near-rt-ric-simulator/src/STD_1.1.3/a1.py @@ -1,5 +1,5 @@ # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2021 Nordix Foundation. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ from connexion import NoContent from flask import Flask, escape, request, Response, make_response from var_declaration import policy_instances, policy_status, callbacks, forced_settings, policy_fingerprint, hosts_set from utils import calcFingerprint -from maincommon import check_apipath, apipath, get_supported_interfaces_response, extract_host_name +from maincommon import check_apipath, apipath, get_supported_interfaces_response, extract_host_name, is_duplicate_check #Constsants APPL_JSON='application/json' @@ -61,9 +61,16 @@ def put_policy(policyId): retcode=201 if policyId in policy_instances.keys(): retcode=200 - fp_previous=calcFingerprint(policy_instances[policyId]) + if (is_duplicate_check()): + fp_previous=calcFingerprint(policy_instances[policyId]) + else: + fp_previous=policyId + + if (is_duplicate_check()): + fp=calcFingerprint(data) + else: + fp=policyId - fp=calcFingerprint(data) if (fp in policy_fingerprint.keys()): p_id=policy_fingerprint[fp] if (p_id != policyId): @@ -113,7 +120,11 @@ def delete_policy(policyId): return r if policyId in policy_instances.keys(): - fp_previous=calcFingerprint(policy_instances[policyId]) + if (is_duplicate_check()): + fp_previous=calcFingerprint(policy_instances[policyId]) + else: + fp_previous=policyId + policy_fingerprint.pop(fp_previous) policy_instances.pop(policyId) policy_status.pop(policyId)