Commit feb2426a authored by Alberto Gonzalez Barneo's avatar Alberto Gonzalez Barneo
Browse files

Added qkd_app into blueprint, new line at the end of files and updated App by QKDApp

parent f77285eb

src/webui/service/__main__.py

+2 −1
Original line number Diff line number Diff line
@@ -70,3 +70,4 @@ def main(): 


if __name__ == '__main__':

    sys.exit(main())

    
 No newline at end of file

src/webui/service/app/routes.py

+4 −4
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ from common.tools.context_queries.Context import get_context 
from common.tools.context_queries.Device import get_device

from common.tools.context_queries.Topology import get_topology

from context.client.ContextClient import ContextClient

from app.client.AppClient import AppClient

from app.client.QKDAppClient import QKDAppClient





LOGGER = logging.getLogger(__name__)

app = Blueprint('app', __name__, url_prefix='/app')

app = Blueprint('qkd_app', __name__, url_prefix='/app')



app_client = AppClient()

qkd_app_client = QKDAppClient()

context_client = ContextClient()



@app.get('/')
@@ -47,7 +47,7 @@ def home(): 
        apps = list()

    else:

        try:

            apps = app_client.ListApps(context_obj.context_id)

            apps = qkd_app_client.ListApps(context_obj.context_id)

            apps = apps.apps

        except grpc.RpcError as e:

            if e.code() != grpc.StatusCode.NOT_FOUND: raise

src/webui/service/device/forms.py

+2 −1
Original line number Diff line number Diff line
@@ -58,3 +58,4 @@ class UpdateDeviceForm(FlaskForm): 
                           validators=[NumberRange(min=0)])

                        

    submit = SubmitField('Update')

    
 No newline at end of file

src/webui/service/service/__init__.py

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

# limitations under the License.

src/webui/service/service/forms.py

+2 −1
Original line number Diff line number Diff line
@@ -282,3 +282,4 @@ class AddServiceForm_L3VPN(FlaskForm): 
    Device_2_IF_address_ip  = StringField('Device_2 IP Address', validators=[CustomInputRequired(), validate_ipv4_address])

    Device_2_IF_address_prefix = IntegerField('Device_2 IP Prefix length', validators=[CustomInputRequired(), validate_uint32])

    Device_2_IF_description = StringField ('Device_2 SubIF Description', validators=[Optional()])

    
 No newline at end of file