From e22fc99488200256b8ab5b2ce897cdf8ab33840e Mon Sep 17 00:00:00 2001
From: Shu0T1an ChenG <shuche@microsoft.com>
Date: Sat, 27 Apr 2019 20:59:09 -0700
Subject: [PATCH] [everflow]: Replace deprecated mirror_session.py file with
 CLI

mirror_session.py file is deprecated; use config mirror_session command instead

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
---
 .../test/files/helpers/mirror_session.py      | 50 -------------------
 .../tasks/everflow_testbed/apply_config.yml   |  6 +--
 .../tasks/everflow_testbed/del_config.yml     |  6 +--
 3 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 ansible/roles/test/files/helpers/mirror_session.py

diff --git a/ansible/roles/test/files/helpers/mirror_session.py b/ansible/roles/test/files/helpers/mirror_session.py
deleted file mode 100644
index 04b3f4e393a..00000000000
--- a/ansible/roles/test/files/helpers/mirror_session.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import click
-from swsssdk import ConfigDBConnector
-
-
-@click.group()
-def cli():
-    pass
-
-
-@cli.command()
-@click.argument('session_name', type=click.STRING, required=True)
-@click.argument('src_ip', type=click.STRING, required=True)
-@click.argument('dst_ip', type=click.STRING, required=True)
-@click.argument('gre_type', type=click.STRING, required=True)
-@click.argument('dscp', type=click.STRING, required=True)
-@click.argument('ttl', type=click.STRING, required=True)
-@click.argument('queue', type=click.STRING, required=True)
-def create(session_name, src_ip, dst_ip, gre_type, dscp, ttl, queue):
-    """
-    Create mirror session.
-    """
-    configdb = ConfigDBConnector()
-    configdb.connect()
-
-    session_info = {
-        "src_ip": src_ip,
-        "dst_ip": dst_ip,
-        "gre_type": gre_type,
-        "dscp": dscp,
-        "ttl": ttl,
-        "queue": queue
-    }
-
-    configdb.set_entry("MIRROR_SESSION", session_name, session_info)
-
-
-@cli.command()
-@click.argument('session_name', type=click.STRING, required=False)
-def delete(session_name):
-    """
-    Delete mirror session.
-    """
-    configdb = ConfigDBConnector()
-    configdb.connect()
-
-    configdb.set_entry("MIRROR_SESSION", session_name, None)
-
-
-if __name__ == "__main__":
-    cli()
diff --git a/ansible/roles/test/tasks/everflow_testbed/apply_config.yml b/ansible/roles/test/tasks/everflow_testbed/apply_config.yml
index dde5b04e9d7..c75e1b0337d 100644
--- a/ansible/roles/test/tasks/everflow_testbed/apply_config.yml
+++ b/ansible/roles/test/tasks/everflow_testbed/apply_config.yml
@@ -8,13 +8,11 @@
 - name: Get session info.
   include: roles/test/tasks/everflow_testbed/get_session_info.yml
 
-- name: Copy python script for session configuration.
-  copy: src=roles/test/files/helpers/mirror_session.py dest={{ run_dir }}/
-
 - name: Copy ACL rules configuration file.
   copy: src={{ tests_location }}/{{ testname}}/acl_rule_persistent.json dest={{ run_dir }}/
 
-- command: "python {{ run_dir }}/mirror_session.py create {{ session_name }} {{ session_src_ip }} {{ session_dst_ip }} {{ session_gre }} {{ session_dscp }} {{ session_ttl }} {{ session_queue }}"
+- command: "config mirror_session add {{session_name}} {{session_src_ip}} {{session_dst_ip}} {{session_dscp}} {{session_ttl}} {{session_gre}} {{session_queue}}"
+  become: yes
 
 - command: "acl-loader update full {{ run_dir }}/acl_rule_persistent.json --session_name={{ session_name }}"
   become: yes
diff --git a/ansible/roles/test/tasks/everflow_testbed/del_config.yml b/ansible/roles/test/tasks/everflow_testbed/del_config.yml
index 07b688e1d3a..4bcff2f2d11 100644
--- a/ansible/roles/test/tasks/everflow_testbed/del_config.yml
+++ b/ansible/roles/test/tasks/everflow_testbed/del_config.yml
@@ -8,13 +8,11 @@
 - name: Get session info.
   include: roles/test/tasks/everflow_testbed/get_session_info.yml
 
-- name: Copy python script for session configuration.
-  copy: src=roles/test/files/helpers/mirror_session.py dest={{ run_dir }}/
-
 - name: Copy ACL rules configuration file.
   copy: src={{ tests_location }}/{{ testname}}/acl_rule_persistent-del.json dest={{ run_dir }}/
 
 - command: "acl-loader update full {{ run_dir }}/acl_rule_persistent-del.json"
   become: yes
 
-- command: "python {{ run_dir }}/mirror_session.py delete {{ session_name }}"
+- command: "config mirror_session remove {{session_name}}"
+  become: yes