Compare commits
10 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8791141cd7 | ||
|
|
5a4816b512 |
||
|
|
5d5dfd64d8 | ||
|
|
ec2b601b61 | ||
|
|
aa830be8c9 | ||
|
|
5e514d60b5 | ||
|
|
dda6c34916 | ||
|
|
80d160f463 | ||
|
|
5201bd029d | ||
|
|
5c17235e27 |
14 changed files with 106 additions and 308 deletions
29
Dockerfile
29
Dockerfile
|
|
@ -1,29 +0,0 @@
|
||||||
FROM docker.io/fedora:25
|
|
||||||
|
|
||||||
MAINTAINER "James Antill" <james.antill@redhat.com>
|
|
||||||
|
|
||||||
RUN dnf install -y --setopt=tsflags=nodocs samba && \
|
|
||||||
dnf install -y --setopt=tsflags=nodocs /usr/bin/pidof && \
|
|
||||||
dnf install -y --setopt=tsflags=nodocs python-mako PyYAML && \
|
|
||||||
dnf -y clean all
|
|
||||||
|
|
||||||
ADD files /files
|
|
||||||
|
|
||||||
# mkdir -p /srv/samba/Demo/
|
|
||||||
RUN mkdir -p /srv/samba
|
|
||||||
RUN /files/config.sh
|
|
||||||
|
|
||||||
RUN sh -c 'date > /srv/samba/tst-build'
|
|
||||||
|
|
||||||
EXPOSE 138/udp
|
|
||||||
EXPOSE 139
|
|
||||||
EXPOSE 445
|
|
||||||
EXPOSE 137/udp
|
|
||||||
EXPOSE 445/udp
|
|
||||||
|
|
||||||
|
|
||||||
# VOLUME ['/var/log', '/srv/samba']
|
|
||||||
|
|
||||||
# USER samba
|
|
||||||
|
|
||||||
CMD ["/files/start.sh"]
|
|
||||||
16
Makefile
16
Makefile
|
|
@ -1,16 +0,0 @@
|
||||||
IMAGE_NAME = samba
|
|
||||||
|
|
||||||
MODULEMDURL=file://samba.yaml
|
|
||||||
|
|
||||||
default: run
|
|
||||||
|
|
||||||
build:
|
|
||||||
docker build --tag=$(IMAGE_NAME) .
|
|
||||||
|
|
||||||
run: build
|
|
||||||
docker run -d $(IMAGE_NAME)
|
|
||||||
|
|
||||||
test: build
|
|
||||||
cd tests; MODULE=docker MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
|
|
||||||
cd tests; MODULE=rpm MODULEMD=$(MODULEMDURL) URL="docker=$(IMAGE_NAME)" make all
|
|
||||||
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
#! /bin/sh -e
|
|
||||||
|
|
||||||
echo Config.
|
|
||||||
python /files/mako-render.py /files/smb.conf.mako /files/config.yaml \
|
|
||||||
> /etc/samba/smb.conf
|
|
||||||
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
mounts:
|
|
||||||
- /srv/samba
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
from __future__ import print_function, unicode_literals
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import mako.template
|
|
||||||
import yaml
|
|
||||||
|
|
||||||
def main():
|
|
||||||
parser = argparse.ArgumentParser()
|
|
||||||
parser.add_argument("template")
|
|
||||||
parser.add_argument("data")
|
|
||||||
options = parser.parse_args()
|
|
||||||
|
|
||||||
with open(options.template) as stream:
|
|
||||||
template = mako.template.Template(stream.read())
|
|
||||||
with open(options.data) as stream:
|
|
||||||
data = yaml.load(stream)
|
|
||||||
|
|
||||||
print(template.render(**data))
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
|
|
||||||
[global]
|
|
||||||
server string = Samba Server Version %v
|
|
||||||
security = user
|
|
||||||
map to guest = bad user
|
|
||||||
# guest account = samba
|
|
||||||
hosts allow = *
|
|
||||||
dead time = 15
|
|
||||||
socket options = TCP_NODELAY SO_KEEPALIVE SO_RCVBUF=17520 SO_SNDBUF=17520 IPTOS_LOWDELAY
|
|
||||||
|
|
||||||
[public]
|
|
||||||
comment = Public test
|
|
||||||
path = /srv/samba
|
|
||||||
public = yes
|
|
||||||
guest ok = yes
|
|
||||||
read only = yes
|
|
||||||
printable = no
|
|
||||||
writeable = no
|
|
||||||
browseable = yes
|
|
||||||
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
#! /bin/sh -e
|
|
||||||
|
|
||||||
function first
|
|
||||||
{
|
|
||||||
echo $1
|
|
||||||
}
|
|
||||||
|
|
||||||
function rest
|
|
||||||
{
|
|
||||||
shift
|
|
||||||
echo $@
|
|
||||||
}
|
|
||||||
|
|
||||||
date > /srv/samba/tst-run
|
|
||||||
|
|
||||||
/usr/sbin/nmbd -D
|
|
||||||
/usr/sbin/smbd -D
|
|
||||||
|
|
||||||
waits="1 1 2 4 8 16 32 64 360"
|
|
||||||
|
|
||||||
while pidof smbd > /dev/null && pidof nmbd > /dev/null ; do
|
|
||||||
date
|
|
||||||
echo "SMBd proces" $(pidof smbd)
|
|
||||||
echo "NMBd proces" $(pidof nmbd)
|
|
||||||
sleep $(first $waits)
|
|
||||||
if [ "x$(rest $waits)" != "x" ]; then
|
|
||||||
waits="$(rest $waits)"
|
|
||||||
fi
|
|
||||||
echo
|
|
||||||
done
|
|
||||||
|
|
||||||
if ! pidof nmbd; then
|
|
||||||
echo "NMBd is not running."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! pidof smbd; then
|
|
||||||
echo "SMBd is not running."
|
|
||||||
fi
|
|
||||||
125
samba.yaml
125
samba.yaml
|
|
@ -1,22 +1,109 @@
|
||||||
document: modulemd
|
document: modulemd
|
||||||
version: 1
|
version: 1
|
||||||
data:
|
data:
|
||||||
name: ''
|
summary: samba module
|
||||||
stream: ''
|
description: This samba module has been generated.
|
||||||
summary: Server and Client software to interoperate with Windows machines
|
license:
|
||||||
version: 0
|
module:
|
||||||
dependencies:
|
- MIT
|
||||||
buildrequires: {bootstrap: f26}
|
dependencies:
|
||||||
requires: {bootstrap: f26}
|
buildrequires:
|
||||||
description: 'Samba is the standard Windows interoperability suite of programs for
|
bootstrap: master
|
||||||
Linux and Unix.'
|
requires:
|
||||||
license:
|
platform: master
|
||||||
content: [GPLv3+ and LGPLv3+]
|
python2: master
|
||||||
module: [MIT]
|
python2-ecosystem: master
|
||||||
api:
|
libtom: master
|
||||||
rpms: [samba, samba-common, samba-client]
|
references:
|
||||||
components:
|
community: https://docs.pagure.org/modularity/
|
||||||
rpms:
|
documentation: https://github.com/modularity-modules/samba
|
||||||
samba: {buildorder: 10, rationale: Runtime dependency.}
|
tracker: https://github.com/modularity-modules/samba
|
||||||
|
api:
|
||||||
|
rpms:
|
||||||
|
- libldb
|
||||||
|
- libsmbclient
|
||||||
|
- libtdb
|
||||||
|
- libwbclient
|
||||||
|
- python2-samba
|
||||||
|
- samba
|
||||||
|
- samba-client-libs
|
||||||
|
- samba-common
|
||||||
|
- samba-common-libs
|
||||||
|
- samba-common-tools
|
||||||
|
- samba-dc-libs
|
||||||
|
- samba-libs
|
||||||
|
- samba-winbind
|
||||||
|
- samba-winbind-modules
|
||||||
|
profiles:
|
||||||
|
default:
|
||||||
|
description: A generated profile based on top-lvl package list.
|
||||||
|
rpms:
|
||||||
|
- libldb
|
||||||
|
- libsmbclient
|
||||||
|
- libtdb
|
||||||
|
- libwbclient
|
||||||
|
- python2-samba
|
||||||
|
- samba
|
||||||
|
- samba-client-libs
|
||||||
|
- samba-common
|
||||||
|
- samba-common-libs
|
||||||
|
- samba-common-tools
|
||||||
|
- samba-dc-libs
|
||||||
|
- samba-libs
|
||||||
|
- samba-winbind
|
||||||
|
- samba-winbind-modules
|
||||||
|
client:
|
||||||
|
description: SMB File sharing client
|
||||||
|
rpms:
|
||||||
|
- libsmbclient
|
||||||
|
- libtdb
|
||||||
|
- samba-client
|
||||||
|
- samba-client-libs
|
||||||
|
- samba-common
|
||||||
|
- samba-common-libs
|
||||||
|
- samba-common-tools
|
||||||
|
server:
|
||||||
|
description: SMB File sharing server
|
||||||
|
rpms:
|
||||||
|
- libldb
|
||||||
|
- libtdb
|
||||||
|
- samba
|
||||||
|
- samba-common
|
||||||
|
- samba-common-libs
|
||||||
|
- samba-common-tools
|
||||||
|
- samba-libs
|
||||||
|
domainclient:
|
||||||
|
description: SMB Domain Client
|
||||||
|
rpms:
|
||||||
|
- libtdb
|
||||||
|
- libwbclient
|
||||||
|
- samba-client-libs
|
||||||
|
- samba-common
|
||||||
|
- samba-common-libs
|
||||||
|
- samba-common-tools
|
||||||
|
- samba-libs
|
||||||
|
- samba-winbind
|
||||||
|
- samba-winbind-modules
|
||||||
|
domaincontroller:
|
||||||
|
description: Windows Domain Controller
|
||||||
|
rpms:
|
||||||
|
- samba-dc
|
||||||
|
components:
|
||||||
|
rpms:
|
||||||
|
avahi:
|
||||||
|
rationale: Generated.
|
||||||
|
ref: 64b07e2fc1d770e12b97ef0296a62f80984d88c0
|
||||||
|
cups:
|
||||||
|
rationale: Generated.
|
||||||
|
ref: b85c292042537a333350465e946606907214aeb5
|
||||||
|
libldb:
|
||||||
|
rationale: Generated.
|
||||||
|
ref: df8cc6a1d9e2bb5296a46287ce03390b1201e5da
|
||||||
|
buildorder: 5
|
||||||
|
libtdb:
|
||||||
|
rationale: Generated.
|
||||||
|
ref: 94c6c6d0e350e5e35776aace06cd0fafbaaa800d
|
||||||
|
samba:
|
||||||
|
rationale: Generated.
|
||||||
|
ref: 8b94bf9ddc2a818eace810b47957650b47383389
|
||||||
|
buildorder: 10
|
||||||
|
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
MODULE_LINT=/usr/share/moduleframework/tools/modulelint.py
|
|
||||||
CMD=python -m avocado run --filter-by-tags=-WIP $(MODULE_LINT) *.py
|
|
||||||
|
|
||||||
#
|
|
||||||
all:
|
|
||||||
generator
|
|
||||||
$(CMD)
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
document: modularity-testing
|
|
||||||
version: 1
|
|
||||||
name: samba
|
|
||||||
modulemd-url: http://pkgs.fedoraproject.org/cgit/modules/samba.git/tree/samba.yaml
|
|
||||||
service:
|
|
||||||
port: [138/udp, 139, 445, 137/udp, 445/udp]
|
|
||||||
packages:
|
|
||||||
rpms:
|
|
||||||
- samba
|
|
||||||
module:
|
|
||||||
docker:
|
|
||||||
start: "docker run -it -P"
|
|
||||||
labels:
|
|
||||||
description: "Server and Client software to interoperate with Windows machines"
|
|
||||||
io.k8s.description: "Server and Client software to interoperate with Windows machines"
|
|
||||||
source: https://github.com/container-images/samba.git
|
|
||||||
container: docker.io/modularitycontainers/samba
|
|
||||||
rpm:
|
|
||||||
start: /usr/sbin/smbd &
|
|
||||||
repo: https://kojipkgs.stg.fedoraproject.org/compose/branched/jkaluza/latest-Fedora-Modular-26/compose/Server/x86_64/os/
|
|
||||||
test:
|
|
||||||
processrunning:
|
|
||||||
- 'ls /proc/*/exe -alh | grep smbd'
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
|
|
||||||
import socket
|
|
||||||
from avocado import main
|
|
||||||
from moduleframework import module_framework
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
|
|
||||||
class GeneratedTestsConfig(module_framework.AvocadoTest):
|
|
||||||
"""
|
|
||||||
:avocado: enable
|
|
||||||
"""
|
|
||||||
|
|
||||||
def test_processrunning(self):
|
|
||||||
self.start()
|
|
||||||
self.run("ls /proc/*/exe -alh | grep smbd")
|
|
||||||
Binary file not shown.
|
|
@ -1,51 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# This Modularity Testing Framework helps you to write tests for modules
|
|
||||||
# Copyright (C) 2017 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# he Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along
|
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Authors: Dominika Hodovska <dhodovsk@redhat.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
from avocado import main
|
|
||||||
from avocado.core import exceptions
|
|
||||||
from moduleframework import module_framework
|
|
||||||
|
|
||||||
|
|
||||||
class SanityCheck(module_framework.AvocadoTest):
|
|
||||||
"""
|
|
||||||
:avocado: enable
|
|
||||||
"""
|
|
||||||
|
|
||||||
def test(self):
|
|
||||||
"""
|
|
||||||
Simple sanity test
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.start()
|
|
||||||
self.run("ls / | grep bin")
|
|
||||||
|
|
||||||
def testSambaVersion(self):
|
|
||||||
"""
|
|
||||||
Check if httpd is installed in correct version
|
|
||||||
"""
|
|
||||||
version = "4.5"
|
|
||||||
self.start()
|
|
||||||
self.run("smbcontrol -V | grep {}".format(version))
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# This Modularity Testing Framework helps you to write tests for modules
|
|
||||||
# Copyright (C) 2017 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# he Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along
|
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Authors: Dominika Hodovska <dhodovsk@redhat.com>
|
|
||||||
#
|
|
||||||
|
|
||||||
from avocado import main
|
|
||||||
from avocado.core import exceptions
|
|
||||||
from moduleframework import module_framework
|
|
||||||
|
|
||||||
|
|
||||||
class SmbConfCheck(module_framework.AvocadoTest):
|
|
||||||
"""
|
|
||||||
:avocado: enable
|
|
||||||
"""
|
|
||||||
def testTestParamFail(self):
|
|
||||||
"""
|
|
||||||
Valid failure of testparam
|
|
||||||
"""
|
|
||||||
|
|
||||||
self.start()
|
|
||||||
|
|
||||||
self.run("testparm -s > /smb-fail")
|
|
||||||
self.run("printf \"\\n[fail]\\n\\tcomment = bad config\\n\" >> /smb-fail")
|
|
||||||
# No path
|
|
||||||
self.run("testparm -s /smb-fail > /out.txt")
|
|
||||||
self.run("cat out.txt | grep \"available = No\"")
|
|
||||||
|
|
||||||
self.run("rm /out.txt")
|
|
||||||
self.run("testparm -s > /smb-fail")
|
|
||||||
|
|
||||||
# bad mask
|
|
||||||
self.run("printf \"\\n[fail]\\n\\tcomment = bad config\\n\" >> /smb-fail")
|
|
||||||
self.run("printf \"\\tcreate mask = 9999\\n\" >> /smb-fail")
|
|
||||||
self.run("testparm -s /smb-fail > /out.txt; [ $? -ne 0 ]")
|
|
||||||
|
|
||||||
self.run("[ ! -s /out.txt ]")
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
main()
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue