Commit d7964dd8 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/pre-release-fixes' into 'develop' 

Pre release CI/CD fixes

See merge request !136
parents 6d70ec5e 06183a32

src/context/service/database/Constraint.py

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ def upsert_constraints( 
        stmt = delete(klass)

        if service_uuid is not None: stmt = stmt.where(klass.service_uuid == service_uuid)

        if slice_uuid   is not None: stmt = stmt.where(klass.slice_uuid   == slice_uuid  )

        stmt = stmt.where(klass.constraint_uuid.in_(uuids_to_delete)

        stmt = stmt.where(klass.constraint_uuid.in_(uuids_to_delete))

        #str_stmt = stmt.compile(dialect=postgresql.dialect(), compile_kwargs={"literal_binds": True})

        #LOGGER.warning('delete stmt={:s}'.format(str(str_stmt)))

        constraint_deletes = session.execute(stmt)

src/device/requirements.in

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 




anytree==2.8.0

APScheduler==3.8.1

APScheduler==3.10.1

cryptography==36.0.2

#fastcache==1.1.0

Jinja2==3.0.3
@@ -22,7 +22,7 @@ ncclient==0.6.13 
p4runtime==1.3.0

paramiko==2.9.2

python-json-logger==2.0.2

pytz==2021.3

#pytz==2021.3

#redis==4.1.2

requests==2.27.1

requests-mock==1.9.3

src/load_generator/requirements.in

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



APScheduler==3.8.1
 
APScheduler==3.10.1

src/monitoring/requirements.in

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# limitations under the License.



anytree==2.8.0

APScheduler==3.8.1

APScheduler==3.10.1

#fastcache==1.1.0

#google-api-core

#opencensus[stackdriver]
@@ -26,7 +26,7 @@ APScheduler==3.8.1 
influx-line-protocol==0.1.4

python-dateutil==2.8.2

python-json-logger==2.0.2

pytz==2021.3

#pytz==2021.3

#redis==4.1.2

requests==2.27.1

xmltodict==0.12.0

src/monitoring/service/EventTools.py

+5 −2
Original line number Diff line number Diff line
@@ -121,9 +121,12 @@ class EventsDeviceCollector: 
                        enabled_endpoint_names.add(json_resource_value['name'])



                    for endpoint in device.device_endpoints:

                        if endpoint.name not in enabled_endpoint_names: continue



                        endpoint_uuid = endpoint.endpoint_id.endpoint_uuid.uuid

                        endpoint_name_or_uuid = endpoint.name

                        if endpoint_name_or_uuid is None or len(endpoint_name_or_uuid) == 0:

                            endpoint_name_or_uuid = endpoint_uuid

                        if endpoint_name_or_uuid not in enabled_endpoint_names: continue



                        self._name_mapping.set_endpoint_name(endpoint_uuid, endpoint.name)



                        for value in endpoint.kpi_sample_types: